<!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>[242786] 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/242786">242786</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2019-03-12 01:13:26 -0700 (Tue, 12 Mar 2019)</dd>
</dl>
<h3>Log Message</h3>
<pre>Implement further CORS restrictions
https://bugs.webkit.org/show_bug.cgi?id=188644
Patch by Rob Buis <rbuis@igalia.com> on 2019-03-12
Reviewed by Darin Adler.
LayoutTests/imported/w3c:
Update improved test results.
* web-platform-tests/fetch/api/cors/cors-preflight-not-cors-safelisted.any-expected.txt:
* web-platform-tests/fetch/api/cors/cors-preflight-not-cors-safelisted.any.worker-expected.txt:
* web-platform-tests/fetch/api/headers/headers-no-cors.window-expected.txt:
Source/WebCore:
Verify that header value length is not greater than 128 [1]. Also implement
Step 5 of [2] to append values to existing header value when calling
Headers.append.
Tests: fetch/api/cors/cors-preflight-not-cors-safelisted.any.html
fetch/api/cors/cors-preflight-not-cors-safelisted.any.worker.html
fetch/api/headers/headers-no-cors.window.html
[1] https://fetch.spec.whatwg.org/#cors-safelisted-request-header
[2] https://fetch.spec.whatwg.org/#concept-headers-append
* Modules/fetch/FetchHeaders.cpp:
(WebCore::canWriteHeader):
(WebCore::appendToHeaderMap):
(WebCore::FetchHeaders::remove):
(WebCore::FetchHeaders::set):
(WebCore::FetchHeaders::filterAndFill):
* platform/network/HTTPParsers.cpp:
(WebCore::isCrossOriginSafeRequestHeader): verify that header length is not greater than 128</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapicorscorspreflightnotcorssafelistedanyexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-preflight-not-cors-safelisted.any-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapicorscorspreflightnotcorssafelistedanyworkerexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-preflight-not-cors-safelisted.any.worker-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapiheadersheadersnocorswindowexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/headers/headers-no-cors.window-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchHeaderscpp">trunk/Source/WebCore/Modules/fetch/FetchHeaders.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkHTTPParserscpp">trunk/Source/WebCore/platform/network/HTTPParsers.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (242785 => 242786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2019-03-12 07:10:58 UTC (rev 242785)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2019-03-12 08:13:26 UTC (rev 242786)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2019-03-12 Rob Buis <rbuis@igalia.com>
+
+ Implement further CORS restrictions
+ https://bugs.webkit.org/show_bug.cgi?id=188644
+
+ Reviewed by Darin Adler.
+
+ Update improved test results.
+
+ * web-platform-tests/fetch/api/cors/cors-preflight-not-cors-safelisted.any-expected.txt:
+ * web-platform-tests/fetch/api/cors/cors-preflight-not-cors-safelisted.any.worker-expected.txt:
+ * web-platform-tests/fetch/api/headers/headers-no-cors.window-expected.txt:
+
</ins><span class="cx"> 2019-03-07 Frederic Wang <fwang@igalia.com>
</span><span class="cx">
</span><span class="cx"> Update WPT tests for embedded content
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapicorscorspreflightnotcorssafelistedanyexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-preflight-not-cors-safelisted.any-expected.txt (242785 => 242786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-preflight-not-cors-safelisted.any-expected.txt 2019-03-12 07:10:58 UTC (rev 242785)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-preflight-not-cors-safelisted.any-expected.txt 2019-03-12 08:13:26 UTC (rev 242786)
</span><span class="lines">@@ -1,12 +1,12 @@
</span><span class="cx">
</span><span class="cx"> PASS Loading data…
</span><span class="cx"> PASS Need CORS-preflight for accept/" header
</span><del>-FAIL Need CORS-preflight for accept/012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678 header assert_equals: Preflight request has been made expected "1" but got "0"
</del><ins>+PASS Need CORS-preflight for accept/012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678 header
</ins><span class="cx"> PASS Need CORS-preflight for accept-language/ header
</span><span class="cx"> PASS Need CORS-preflight for accept-language/@ header
</span><span class="cx"> PASS Need CORS-preflight for content-language/ header
</span><span class="cx"> PASS Need CORS-preflight for content-language/@ header
</span><span class="cx"> PASS Need CORS-preflight for content-type/text/html header
</span><del>-FAIL Need CORS-preflight for content-type/text/plain; long=0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901 header assert_equals: Preflight request has been made expected "1" but got "0"
</del><ins>+PASS Need CORS-preflight for content-type/text/plain; long=0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901 header
</ins><span class="cx"> PASS Need CORS-preflight for test/hi header
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapicorscorspreflightnotcorssafelistedanyworkerexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-preflight-not-cors-safelisted.any.worker-expected.txt (242785 => 242786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-preflight-not-cors-safelisted.any.worker-expected.txt 2019-03-12 07:10:58 UTC (rev 242785)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-preflight-not-cors-safelisted.any.worker-expected.txt 2019-03-12 08:13:26 UTC (rev 242786)
</span><span class="lines">@@ -1,12 +1,12 @@
</span><span class="cx">
</span><span class="cx"> PASS Loading data…
</span><span class="cx"> PASS Need CORS-preflight for accept/" header
</span><del>-FAIL Need CORS-preflight for accept/012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678 header assert_equals: Preflight request has been made expected "1" but got "0"
</del><ins>+PASS Need CORS-preflight for accept/012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678 header
</ins><span class="cx"> PASS Need CORS-preflight for accept-language/ header
</span><span class="cx"> PASS Need CORS-preflight for accept-language/@ header
</span><span class="cx"> PASS Need CORS-preflight for content-language/ header
</span><span class="cx"> PASS Need CORS-preflight for content-language/@ header
</span><span class="cx"> PASS Need CORS-preflight for content-type/text/html header
</span><del>-FAIL Need CORS-preflight for content-type/text/plain; long=0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901 header assert_equals: Preflight request has been made expected "1" but got "0"
</del><ins>+PASS Need CORS-preflight for content-type/text/plain; long=0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901 header
</ins><span class="cx"> PASS Need CORS-preflight for test/hi header
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapiheadersheadersnocorswindowexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/headers/headers-no-cors.window-expected.txt (242785 => 242786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/headers/headers-no-cors.window-expected.txt 2019-03-12 07:10:58 UTC (rev 242785)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/headers/headers-no-cors.window-expected.txt 2019-03-12 08:13:26 UTC (rev 242786)
</span><span class="lines">@@ -1,20 +1,20 @@
</span><span class="cx">
</span><span class="cx"> PASS Loading data…
</span><del>-FAIL "no-cors" Headers object cannot have accept set to sssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss, , sssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss assert_equals: 1 expected "sssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss" but got "sssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss, "
-FAIL "no-cors" Headers object cannot have accept-language set to sssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss, , sssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss assert_equals: 1 expected "sssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss" but got "sssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss, "
-FAIL "no-cors" Headers object cannot have content-language set to sssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss, , sssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss assert_equals: 1 expected "sssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss" but got "sssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss, "
-FAIL "no-cors" Headers object cannot have accept set to , sssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss assert_equals: 1 expected "" but got ", sssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss"
-FAIL "no-cors" Headers object cannot have accept-language set to , sssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss assert_equals: 1 expected "" but got ", sssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss"
-FAIL "no-cors" Headers object cannot have content-language set to , sssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss assert_equals: 1 expected "" but got ", sssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss"
-FAIL "no-cors" Headers object cannot have content-type set to text/plain;ssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss, text/plain assert_equals: 1 expected "text/plain;ssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss" but got "text/plain;ssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss, text/plain"
</del><ins>+PASS "no-cors" Headers object cannot have accept set to sssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss, , sssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss
+PASS "no-cors" Headers object cannot have accept-language set to sssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss, , sssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss
+PASS "no-cors" Headers object cannot have content-language set to sssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss, , sssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss
+PASS "no-cors" Headers object cannot have accept set to , sssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss
+PASS "no-cors" Headers object cannot have accept-language set to , sssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss
+PASS "no-cors" Headers object cannot have content-language set to , sssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss
+PASS "no-cors" Headers object cannot have content-type set to text/plain;ssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss, text/plain
</ins><span class="cx"> PASS "no-cors" Headers object cannot have accept/" as header
</span><del>-FAIL "no-cors" Headers object cannot have accept/012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678 as header assert_false: expected false got true
</del><ins>+PASS "no-cors" Headers object cannot have accept/012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678 as header
</ins><span class="cx"> PASS "no-cors" Headers object cannot have accept-language/ as header
</span><span class="cx"> PASS "no-cors" Headers object cannot have accept-language/@ as header
</span><span class="cx"> PASS "no-cors" Headers object cannot have content-language/ as header
</span><span class="cx"> PASS "no-cors" Headers object cannot have content-language/@ as header
</span><span class="cx"> PASS "no-cors" Headers object cannot have content-type/text/html as header
</span><del>-FAIL "no-cors" Headers object cannot have content-type/text/plain; long=0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901 as header assert_false: expected false got true
</del><ins>+PASS "no-cors" Headers object cannot have content-type/text/plain; long=0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901 as header
</ins><span class="cx"> PASS "no-cors" Headers object cannot have test/hi as header
</span><span class="cx"> PASS "no-cors" Headers object cannot have dpr/2 as header
</span><span class="cx"> PASS "no-cors" Headers object cannot have downlink/1 as header
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (242785 => 242786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2019-03-12 07:10:58 UTC (rev 242785)
+++ trunk/Source/WebCore/ChangeLog 2019-03-12 08:13:26 UTC (rev 242786)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2019-03-12 Rob Buis <rbuis@igalia.com>
+
+ Implement further CORS restrictions
+ https://bugs.webkit.org/show_bug.cgi?id=188644
+
+ Reviewed by Darin Adler.
+
+ Verify that header value length is not greater than 128 [1]. Also implement
+ Step 5 of [2] to append values to existing header value when calling
+ Headers.append.
+
+ Tests: fetch/api/cors/cors-preflight-not-cors-safelisted.any.html
+ fetch/api/cors/cors-preflight-not-cors-safelisted.any.worker.html
+ fetch/api/headers/headers-no-cors.window.html
+
+ [1] https://fetch.spec.whatwg.org/#cors-safelisted-request-header
+ [2] https://fetch.spec.whatwg.org/#concept-headers-append
+
+ * Modules/fetch/FetchHeaders.cpp:
+ (WebCore::canWriteHeader):
+ (WebCore::appendToHeaderMap):
+ (WebCore::FetchHeaders::remove):
+ (WebCore::FetchHeaders::set):
+ (WebCore::FetchHeaders::filterAndFill):
+ * platform/network/HTTPParsers.cpp:
+ (WebCore::isCrossOriginSafeRequestHeader): verify that header length is not greater than 128
+
</ins><span class="cx"> 2019-03-11 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove OS X Server QuickTime plugin quirks
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchHeaderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchHeaders.cpp (242785 => 242786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchHeaders.cpp 2019-03-12 07:10:58 UTC (rev 242785)
+++ trunk/Source/WebCore/Modules/fetch/FetchHeaders.cpp 2019-03-12 08:13:26 UTC (rev 242786)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static ExceptionOr<bool> canWriteHeader(const String& name, const String& value, FetchHeaders::Guard guard)
</del><ins>+static ExceptionOr<bool> canWriteHeader(const String& name, const String& value, const String& combinedValue, FetchHeaders::Guard guard)
</ins><span class="cx"> {
</span><span class="cx"> if (!isValidHTTPToken(name))
</span><span class="cx"> return Exception { TypeError, makeString("Invalid header name: '", name, "'") };
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> return Exception { TypeError, "Headers object's guard is 'immutable'"_s };
</span><span class="cx"> if (guard == FetchHeaders::Guard::Request && isForbiddenHeaderName(name))
</span><span class="cx"> return false;
</span><del>- if (guard == FetchHeaders::Guard::RequestNoCors && !isSimpleHeader(name, value))
</del><ins>+ if (guard == FetchHeaders::Guard::RequestNoCors && !combinedValue.isEmpty() && !isSimpleHeader(name, combinedValue))
</ins><span class="cx"> return false;
</span><span class="cx"> if (guard == FetchHeaders::Guard::Response && isForbiddenResponseHeaderName(name))
</span><span class="cx"> return false;
</span><span class="lines">@@ -53,18 +53,21 @@
</span><span class="cx"> static ExceptionOr<void> appendToHeaderMap(const String& name, const String& value, HTTPHeaderMap& headers, FetchHeaders::Guard guard)
</span><span class="cx"> {
</span><span class="cx"> String normalizedValue = stripLeadingAndTrailingHTTPSpaces(value);
</span><del>- auto canWriteResult = canWriteHeader(name, normalizedValue, guard);
</del><ins>+ String combinedValue = normalizedValue;
+ if (headers.contains(name))
+ combinedValue = makeString(headers.get(name), ", ", normalizedValue);
+ auto canWriteResult = canWriteHeader(name, normalizedValue, combinedValue, guard);
</ins><span class="cx"> if (canWriteResult.hasException())
</span><span class="cx"> return canWriteResult.releaseException();
</span><span class="cx"> if (!canWriteResult.releaseReturnValue())
</span><span class="cx"> return { };
</span><del>- headers.add(name, normalizedValue);
</del><ins>+ headers.set(name, combinedValue);
</ins><span class="cx"> return { };
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static ExceptionOr<void> appendToHeaderMap(const HTTPHeaderMap::HTTPHeaderMapConstIterator::KeyValue& header, HTTPHeaderMap& headers, FetchHeaders::Guard guard)
</span><span class="cx"> {
</span><del>- auto canWriteResult = canWriteHeader(header.key, header.value, guard);
</del><ins>+ auto canWriteResult = canWriteHeader(header.key, header.value, header.value, guard);
</ins><span class="cx"> if (canWriteResult.hasException())
</span><span class="cx"> return canWriteResult.releaseException();
</span><span class="cx"> if (!canWriteResult.releaseReturnValue())
</span><span class="lines">@@ -136,7 +139,7 @@
</span><span class="cx">
</span><span class="cx"> ExceptionOr<void> FetchHeaders::remove(const String& name)
</span><span class="cx"> {
</span><del>- auto canWriteResult = canWriteHeader(name, { }, m_guard);
</del><ins>+ auto canWriteResult = canWriteHeader(name, { }, { }, m_guard);
</ins><span class="cx"> if (canWriteResult.hasException())
</span><span class="cx"> return canWriteResult.releaseException();
</span><span class="cx"> if (!canWriteResult.releaseReturnValue())
</span><span class="lines">@@ -162,7 +165,7 @@
</span><span class="cx"> ExceptionOr<void> FetchHeaders::set(const String& name, const String& value)
</span><span class="cx"> {
</span><span class="cx"> String normalizedValue = stripLeadingAndTrailingHTTPSpaces(value);
</span><del>- auto canWriteResult = canWriteHeader(name, normalizedValue, m_guard);
</del><ins>+ auto canWriteResult = canWriteHeader(name, normalizedValue, normalizedValue, m_guard);
</ins><span class="cx"> if (canWriteResult.hasException())
</span><span class="cx"> return canWriteResult.releaseException();
</span><span class="cx"> if (!canWriteResult.releaseReturnValue())
</span><span class="lines">@@ -174,7 +177,7 @@
</span><span class="cx"> void FetchHeaders::filterAndFill(const HTTPHeaderMap& headers, Guard guard)
</span><span class="cx"> {
</span><span class="cx"> for (auto& header : headers) {
</span><del>- auto canWriteResult = canWriteHeader(header.key, header.value, guard);
</del><ins>+ auto canWriteResult = canWriteHeader(header.key, header.value, header.value, guard);
</ins><span class="cx"> if (canWriteResult.hasException())
</span><span class="cx"> continue;
</span><span class="cx"> if (!canWriteResult.releaseReturnValue())
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkHTTPParserscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/HTTPParsers.cpp (242785 => 242786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/HTTPParsers.cpp 2019-03-12 07:10:58 UTC (rev 242785)
+++ trunk/Source/WebCore/platform/network/HTTPParsers.cpp 2019-03-12 08:13:26 UTC (rev 242786)
</span><span class="lines">@@ -859,19 +859,26 @@
</span><span class="cx"> {
</span><span class="cx"> switch (name) {
</span><span class="cx"> case HTTPHeaderName::Accept:
</span><del>- return isValidAcceptHeaderValue(value);
</del><ins>+ if (!isValidAcceptHeaderValue(value))
+ return false;
+ break;
</ins><span class="cx"> case HTTPHeaderName::AcceptLanguage:
</span><span class="cx"> case HTTPHeaderName::ContentLanguage:
</span><del>- return isValidLanguageHeaderValue(value);
</del><ins>+ if (!isValidLanguageHeaderValue(value))
+ return false;
+ break;
</ins><span class="cx"> case HTTPHeaderName::ContentType: {
</span><span class="cx"> // Preflight is required for MIME types that can not be sent via form submission.
</span><span class="cx"> String mimeType = extractMIMETypeFromMediaType(value);
</span><del>- return equalLettersIgnoringASCIICase(mimeType, "application/x-www-form-urlencoded") || equalLettersIgnoringASCIICase(mimeType, "multipart/form-data") || equalLettersIgnoringASCIICase(mimeType, "text/plain");
</del><ins>+ if (!(equalLettersIgnoringASCIICase(mimeType, "application/x-www-form-urlencoded") || equalLettersIgnoringASCIICase(mimeType, "multipart/form-data") || equalLettersIgnoringASCIICase(mimeType, "text/plain")))
+ return false;
+ break;
</ins><span class="cx"> }
</span><span class="cx"> default:
</span><span class="cx"> // FIXME: Should we also make safe other headers (DPR, Downlink, Save-Data...)? That would require validating their values.
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><ins>+ return value.length() <= 128;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Implements <https://fetch.spec.whatwg.org/#concept-method-normalize>.
</span></span></pre>
</div>
</div>
</body>
</html>