Attachment 342114 Details for Bug 167112 – Patch for landing

[patch] Patch for landing

bug-167112-20180606202931.patch (text/plain), 13.55 KB, created by youenn fablet on 2018-06-06 20:29:49 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: youenn fablet

Created: 2018-06-06 20:29:49 PDT

Size: 13.55 KB

patch

obsolete

>Subversion Revision: 232536
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index a2d986c2ea9dfd7db012d60bfa944d1ac42deb8b..5b568f44623e79940a72be852586ab2bad2a6b6d 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,19 @@
>+2018-06-06  Youenn Fablet  <youenn@apple.com>
>+
>+        HTTP Header values validation is too strict
>+        https://bugs.webkit.org/show_bug.cgi?id=167112
>+
>+        Reviewed by Alex Christensen.
>+
>+        Moving header values and names from DOMString to ByteString as per spec.
>+        Updating WebCore::isValidHTTPHeaderValue as per https://fetch.spec.whatwg.org/#terminology-headers.
>+
>+        Covered by rebased and updated tests.
>+        Updated test is now also passing in other browsers.
>+
>+        * platform/network/HTTPParsers.cpp:
>+        (WebCore::isValidHTTPHeaderValue):
>+
> 2018-06-06  Youenn Fablet  <youenn@apple.com>
> 
>         Add Accept-Encoding: identity to Range requests
>diff --git a/Source/WebCore/platform/network/HTTPParsers.cpp b/Source/WebCore/platform/network/HTTPParsers.cpp
>index 4c3ac52e06275da4086b78573705d703dc7956c4..2028da468aafadd9d3d02661d52ebc77595c872e 100644
>--- a/Source/WebCore/platform/network/HTTPParsers.cpp
>+++ b/Source/WebCore/platform/network/HTTPParsers.cpp
>@@ -85,7 +85,7 @@ static inline bool skipEquals(const String& str, unsigned &pos)
>     return skipWhiteSpace(str, pos) && str[pos++] == '=' && skipWhiteSpace(str, pos);
> }
> 
>-// True if a value present, incrementing pos to next space or semicolon, if any.  
>+// True if a value present, incrementing pos to next space or semicolon, if any.
> // Note: might return pos == str.length().
> static inline bool skipValue(const String& str, unsigned& pos)
> {
>@@ -110,7 +110,7 @@ bool isValidReasonPhrase(const String& value)
>     return true;
> }
> 
>-// See RFC 7230, Section 3.2.3.
>+// See https://fetch.spec.whatwg.org/#concept-header
> bool isValidHTTPHeaderValue(const String& value)
> {
>     UChar c = value[0];
>@@ -121,7 +121,8 @@ bool isValidHTTPHeaderValue(const String& value)
>         return false;
>     for (unsigned i = 0; i < value.length(); ++i) {
>         c = value[i];
>-        if (c == 0x7F || c > 0xFF || (c < 0x20 && c != '\t'))
>+        ASSERT(c <= 0xFF);
>+        if (c == 0x00 || c == 0x0A || c == 0x0D)
>             return false;
>     }
>     return true;
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 3dc8f6e3755fca713ad63bd9e23f33e2e2e9a9ff..f8123fccc2cec20659fb65a92e68fae1dfc79bfa 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,12 @@
>+2018-06-06  Youenn Fablet  <youenn@apple.com>
>+
>+        HTTP Header values validation is too strict
>+        https://bugs.webkit.org/show_bug.cgi?id=167112
>+
>+        Reviewed by Alex Christensen.
>+
>+        * http/tests/xmlhttprequest/set-bad-headervalue.html:
>+
> 2018-06-06  Youenn Fablet  <youenn@apple.com>
> 
>         Improve error messages in case FetchEvent.respondWith has a rejected promise
>diff --git a/LayoutTests/imported/w3c/ChangeLog b/LayoutTests/imported/w3c/ChangeLog
>index a8e76d8312c4e174a9efc2165706e43294837fb4..ca05275be009b4d9ffad11f5bddc1e528b56a96a 100644
>--- a/LayoutTests/imported/w3c/ChangeLog
>+++ b/LayoutTests/imported/w3c/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-06-06  Youenn Fablet  <youenn@apple.com>
>+
>+        HTTP Header values validation is too strict
>+        https://bugs.webkit.org/show_bug.cgi?id=167112
>+
>+        Reviewed by Alex Christensen.
>+
>+        Rebased from WPT repository.
>+
>+        * web-platform-tests/fetch/api/headers/header-values-normalize-exptected.txt: Added.
>+        * web-platform-tests/fetch/api/headers/header-values-expected.txt: Added.
>+
> 2018-06-06  Youenn Fablet  <youenn@apple.com>
> 
>         Add Accept-Encoding: identity to Range requests
>diff --git a/LayoutTests/http/tests/xmlhttprequest/set-bad-headervalue.html b/LayoutTests/http/tests/xmlhttprequest/set-bad-headervalue.html
>index 162f7804a77239c111182f312f9113f18d72e069..8ba303322e61fbfb77324acca28d85471c498187 100644
>--- a/LayoutTests/http/tests/xmlhttprequest/set-bad-headervalue.html
>+++ b/LayoutTests/http/tests/xmlhttprequest/set-bad-headervalue.html
>@@ -24,12 +24,12 @@
>       try_value("t\rt", {name:'SyntaxError'})
>       try_value("t\nt", {name:'SyntaxError'})
>       try_value("ï¾ï½½ï¾", {name:'TypeError'})
>-      try_value("t\bt", {name:'SyntaxError'})
>-      try_value("t\vt", {name:'SyntaxError'})
>+      try_value("t\bt")
>+      try_value("t\vt")
>       try_value("t\tt")
>       try_value("t t")
>       try_value("\xd0\xa1")
>-      try_value("\x7f", {name:'SyntaxError'})
>+      try_value("\x7f")
>       test(function() {
>         var client = new XMLHttpRequest()
>         client.open("GET", "...")
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/headers/header-values-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/headers/header-values-expected.txt
>index 0af148b89bbd01e1dae851ce68c72bb46cf4bbce..0d5533e25c8735f2c87797717299ef099503df8d 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/headers/header-values-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/headers/header-values-expected.txt
>@@ -5,6 +5,6 @@ PASS XMLHttpRequest with value x%0Ax needs to throw
> PASS fetch() with value x%0Ax needs to throw 
> PASS XMLHttpRequest with value x%0Dx needs to throw 
> PASS fetch() with value x%0Dx needs to throw 
>-FAIL XMLHttpRequest with all valid values The string did not match the expected pattern.
>-FAIL fetch() with all valid values Header 'val0' has invalid value: 'xx'
>+PASS XMLHttpRequest with all valid values 
>+PASS fetch() with all valid values 
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/headers/header-values-normalize-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/headers/header-values-normalize-expected.txt
>index f1671060b6b6edd811190d3416494dcfde8d822d..27842294f71f076cd6ef8737dc448d8ca50450c7 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/headers/header-values-normalize-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/headers/header-values-normalize-expected.txt
>@@ -1,64 +1,64 @@
> 
> PASS XMLHttpRequest with value %00 
> PASS fetch() with value %00 
>-FAIL XMLHttpRequest with value %01 The string did not match the expected pattern.
>-FAIL fetch() with value %01 promise_test: Unhandled rejection with value: object "TypeError: Header 'val1' has invalid value: ''"
>-FAIL XMLHttpRequest with value %02 The string did not match the expected pattern.
>-FAIL fetch() with value %02 promise_test: Unhandled rejection with value: object "TypeError: Header 'val1' has invalid value: ''"
>-FAIL XMLHttpRequest with value %03 The string did not match the expected pattern.
>-FAIL fetch() with value %03 promise_test: Unhandled rejection with value: object "TypeError: Header 'val1' has invalid value: ''"
>-FAIL XMLHttpRequest with value %04 The string did not match the expected pattern.
>-FAIL fetch() with value %04 promise_test: Unhandled rejection with value: object "TypeError: Header 'val1' has invalid value: ''"
>-FAIL XMLHttpRequest with value %05 The string did not match the expected pattern.
>-FAIL fetch() with value %05 promise_test: Unhandled rejection with value: object "TypeError: Header 'val1' has invalid value: ''"
>-FAIL XMLHttpRequest with value %06 The string did not match the expected pattern.
>-FAIL fetch() with value %06 promise_test: Unhandled rejection with value: object "TypeError: Header 'val1' has invalid value: ''"
>-FAIL XMLHttpRequest with value %07 The string did not match the expected pattern.
>-FAIL fetch() with value %07 promise_test: Unhandled rejection with value: object "TypeError: Header 'val1' has invalid value: ''"
>-FAIL XMLHttpRequest with value %08 The string did not match the expected pattern.
>-FAIL fetch() with value %08 promise_test: Unhandled rejection with value: object "TypeError: Header 'val1' has invalid value: ''"
>+PASS XMLHttpRequest with value %01 
>+PASS fetch() with value %01 
>+PASS XMLHttpRequest with value %02 
>+PASS fetch() with value %02 
>+PASS XMLHttpRequest with value %03 
>+PASS fetch() with value %03 
>+PASS XMLHttpRequest with value %04 
>+PASS fetch() with value %04 
>+PASS XMLHttpRequest with value %05 
>+PASS fetch() with value %05 
>+PASS XMLHttpRequest with value %06 
>+PASS fetch() with value %06 
>+PASS XMLHttpRequest with value %07 
>+PASS fetch() with value %07 
>+PASS XMLHttpRequest with value %08 
>+PASS fetch() with value %08 
> PASS XMLHttpRequest with value %09 
> PASS fetch() with value %09 
> PASS XMLHttpRequest with value %0A 
> PASS fetch() with value %0A 
> PASS XMLHttpRequest with value %0D 
> PASS fetch() with value %0D 
>-FAIL XMLHttpRequest with value %0E The string did not match the expected pattern.
>-FAIL fetch() with value %0E promise_test: Unhandled rejection with value: object "TypeError: Header 'val1' has invalid value: ''"
>-FAIL XMLHttpRequest with value %0F The string did not match the expected pattern.
>-FAIL fetch() with value %0F promise_test: Unhandled rejection with value: object "TypeError: Header 'val1' has invalid value: ''"
>-FAIL XMLHttpRequest with value %10 The string did not match the expected pattern.
>-FAIL fetch() with value %10 promise_test: Unhandled rejection with value: object "TypeError: Header 'val1' has invalid value: ''"
>-FAIL XMLHttpRequest with value %11 The string did not match the expected pattern.
>-FAIL fetch() with value %11 promise_test: Unhandled rejection with value: object "TypeError: Header 'val1' has invalid value: ''"
>-FAIL XMLHttpRequest with value %12 The string did not match the expected pattern.
>-FAIL fetch() with value %12 promise_test: Unhandled rejection with value: object "TypeError: Header 'val1' has invalid value: ''"
>-FAIL XMLHttpRequest with value %13 The string did not match the expected pattern.
>-FAIL fetch() with value %13 promise_test: Unhandled rejection with value: object "TypeError: Header 'val1' has invalid value: ''"
>-FAIL XMLHttpRequest with value %14 The string did not match the expected pattern.
>-FAIL fetch() with value %14 promise_test: Unhandled rejection with value: object "TypeError: Header 'val1' has invalid value: ''"
>-FAIL XMLHttpRequest with value %15 The string did not match the expected pattern.
>-FAIL fetch() with value %15 promise_test: Unhandled rejection with value: object "TypeError: Header 'val1' has invalid value: ''"
>-FAIL XMLHttpRequest with value %16 The string did not match the expected pattern.
>-FAIL fetch() with value %16 promise_test: Unhandled rejection with value: object "TypeError: Header 'val1' has invalid value: ''"
>-FAIL XMLHttpRequest with value %17 The string did not match the expected pattern.
>-FAIL fetch() with value %17 promise_test: Unhandled rejection with value: object "TypeError: Header 'val1' has invalid value: ''"
>-FAIL XMLHttpRequest with value %18 The string did not match the expected pattern.
>-FAIL fetch() with value %18 promise_test: Unhandled rejection with value: object "TypeError: Header 'val1' has invalid value: ''"
>-FAIL XMLHttpRequest with value %19 The string did not match the expected pattern.
>-FAIL fetch() with value %19 promise_test: Unhandled rejection with value: object "TypeError: Header 'val1' has invalid value: ''"
>-FAIL XMLHttpRequest with value %1A The string did not match the expected pattern.
>-FAIL fetch() with value %1A promise_test: Unhandled rejection with value: object "TypeError: Header 'val1' has invalid value: ''"
>-FAIL XMLHttpRequest with value %1B The string did not match the expected pattern.
>-FAIL fetch() with value %1B promise_test: Unhandled rejection with value: object "TypeError: Header 'val1' has invalid value: ''"
>-FAIL XMLHttpRequest with value %1C The string did not match the expected pattern.
>-FAIL fetch() with value %1C promise_test: Unhandled rejection with value: object "TypeError: Header 'val1' has invalid value: ''"
>-FAIL XMLHttpRequest with value %1D The string did not match the expected pattern.
>-FAIL fetch() with value %1D promise_test: Unhandled rejection with value: object "TypeError: Header 'val1' has invalid value: ''"
>-FAIL XMLHttpRequest with value %1E The string did not match the expected pattern.
>-FAIL fetch() with value %1E promise_test: Unhandled rejection with value: object "TypeError: Header 'val1' has invalid value: ''"
>-FAIL XMLHttpRequest with value %1F The string did not match the expected pattern.
>-FAIL fetch() with value %1F promise_test: Unhandled rejection with value: object "TypeError: Header 'val1' has invalid value: ''"
>+PASS XMLHttpRequest with value %0E 
>+PASS fetch() with value %0E 
>+PASS XMLHttpRequest with value %0F 
>+PASS fetch() with value %0F 
>+PASS XMLHttpRequest with value %10 
>+PASS fetch() with value %10 
>+PASS XMLHttpRequest with value %11 
>+PASS fetch() with value %11 
>+PASS XMLHttpRequest with value %12 
>+PASS fetch() with value %12 
>+PASS XMLHttpRequest with value %13 
>+PASS fetch() with value %13 
>+PASS XMLHttpRequest with value %14 
>+PASS fetch() with value %14 
>+PASS XMLHttpRequest with value %15 
>+PASS fetch() with value %15 
>+PASS XMLHttpRequest with value %16 
>+PASS fetch() with value %16 
>+PASS XMLHttpRequest with value %17 
>+PASS fetch() with value %17 
>+PASS XMLHttpRequest with value %18 
>+PASS fetch() with value %18 
>+PASS XMLHttpRequest with value %19 
>+PASS fetch() with value %19 
>+PASS XMLHttpRequest with value %1A 
>+PASS fetch() with value %1A 
>+PASS XMLHttpRequest with value %1B 
>+PASS fetch() with value %1B 
>+PASS XMLHttpRequest with value %1C 
>+PASS fetch() with value %1C 
>+PASS XMLHttpRequest with value %1D 
>+PASS fetch() with value %1D 
>+PASS XMLHttpRequest with value %1E 
>+PASS fetch() with value %1E 
>+PASS XMLHttpRequest with value %1F 
>+PASS fetch() with value %1F 
> PASS XMLHttpRequest with value %20 
> PASS fetch() with value %20 
>

Actions: View | Formatted Diff | Diff

Attachments on bug 167112: 299159 | 299160 | 299165 | 299166 | 299167 | 299168 | 299246 | 340629 | 340639 | 340643 | 342114