Changeset 205253 in webkit

Timestamp:

Aug 31, 2016 9:44:49 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

[Fetch API] Request construction failure should not set "bodyUsed"
​https://bugs.webkit.org/show_bug.cgi?id=161432

Patch by Youenn Fablet <​youenn@apple.com> on 2016-08-31
Reviewed by Alex Christensen.

LayoutTests/imported/w3c:

• web-platform-tests/fetch/api/request/request-disturbed-expected.txt:
• web-platform-tests/fetch/api/request/request-disturbed.html:

Source/WebCore:

Covered by added sub-test coming from chromium fetch test suite.

• Modules/fetch/FetchRequest.cpp:

(WebCore::methodCanHaveBody):
(WebCore::FetchRequest::setBody): Check whether request can have a body before disturbing the passed request.
(WebCore::validateBodyAndMethod): Deleted.

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-disturbed-expected.txt (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-disturbed.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/fetch/FetchRequest.cpp (modified) (4 diffs)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2016-08-31  Youenn Fablet  <youenn@apple.com>
+
+        [Fetch API] Request construction failure should not set "bodyUsed"
+        https://bugs.webkit.org/show_bug.cgi?id=161432
+
+        Reviewed by Alex Christensen.
+
+        * web-platform-tests/fetch/api/request/request-disturbed-expected.txt:
+        * web-platform-tests/fetch/api/request/request-disturbed.html:
+
 2016-08-31  Romain Bellessort  <romain.bellessort@crf.canon.fr>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-disturbed-expected.txt

@@ -5 +5 @@
 PASS Input request used for creating new request became disturbed 
 PASS Check consuming a disturbed request 
+PASS Request construction failure should not set "bodyUsed" 
 

trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-disturbed.html

@@ -51 +51 @@
         return promise_rejects(test, new TypeError(), bodyConsumed.blob());
       }, "Check consuming a disturbed request");
+
+      test(function() {
+        var req = new Request(URL, {method: 'POST', body: 'hello'});
+        assert_false(req.bodyUsed,
+                     'Request should not be flagged as used if it has not been ' +
+                     'consumed.');
+        assert_throws(
+          {name: 'TypeError'},
+          function() { new Request(req, {method: 'GET'}); },
+          'A get request may not have body.');
+
+        assert_false(req.bodyUsed, 'After the GET case');
+
+        assert_throws(
+          {name: 'TypeError'},
+          function() { new Request(req, {method: 'CONNECT'}); },
+          'Request() with a forbidden method must throw.');
+
+        assert_false(req.bodyUsed, 'After the forbidden method case');
+
+        var req2 = new Request(req);
+        assert_true(req.bodyUsed,
+                    'Request should be flagged as used if it has been consumed.');
+      }, 'Request construction failure should not set "bodyUsed"');
     </script>
   </body>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-08-31  Youenn Fablet  <youenn@apple.com>
+
+        [Fetch API] Request construction failure should not set "bodyUsed"
+        https://bugs.webkit.org/show_bug.cgi?id=161432
+
+        Reviewed by Alex Christensen.
+
+        Covered by added sub-test coming from chromium fetch test suite.
+
+        * Modules/fetch/FetchRequest.cpp:
+        (WebCore::methodCanHaveBody):
+        (WebCore::FetchRequest::setBody): Check whether request can have a body before disturbing the passed request.
+        (WebCore::validateBodyAndMethod): Deleted.
+
 2016-08-31  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/Modules/fetch/FetchRequest.cpp

@@ -194 +194 @@
 }
 
-static bool validateBodyAndMethod(const FetchBody& body, const FetchRequest::InternalRequest& internalRequest)
-{
-    if (body.isEmpty())
-        return true;
+static bool methodCanHaveBody(const FetchRequest::InternalRequest& internalRequest)
+{
     return internalRequest.request.httpMethod() != "GET" && internalRequest.request.httpMethod() != "HEAD";
 }
@@ -258 +256 @@
 {
     if (!body.isNull()) {
+        if (!methodCanHaveBody(m_internalRequest)) {
+            ec = TypeError;
+            return;
+        }
+
         ASSERT(scriptExecutionContext());
         m_body = FetchBody::extract(*scriptExecutionContext(), execState, body);
@@ -266 +269 @@
     }
     else if (request && !request->m_body.isEmpty()) {
+        if (!methodCanHaveBody(m_internalRequest)) {
+            ec = TypeError;
+            return;
+        }
+
         m_body = FetchBody::extractFromBody(&request->m_body);
         request->setDisturbed();
@@ -271 +279 @@
 
     m_body.updateContentType(m_headers);
-
-    if (!validateBodyAndMethod(m_body, m_internalRequest))
-        ec = TypeError;
 }