Make the Response constructor throw when status is a null body status and body is non-null

Source/modules/fetch/Response.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "modules/fetch/Response.h"
 
 #include "bindings/core/v8/Dictionary.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/DOMArrayBuffer.h"
@@ skipping 44 matching lines @@
     case WebServiceWorkerResponseTypeDefault:
         break;
     case WebServiceWorkerResponseTypeError:
         ASSERT(response->type() == FetchResponseData::ErrorType);
         break;
     }
 
     return response;
 }
 
+// Checks whether |status| is a null body status.
+// Spec: https://fetch.spec.whatwg.org/#null-body-status
+bool isNullBodyStatus(unsigned short status)
+{
+    if (status == 101 || status == 204 || status == 205 || status == 304)
+        return true;
+
+    return false;
+}
+
 // Check whether |statusText| is a ByteString and
 // matches the Reason-Phrase token production.
 // RFC 2616: https://tools.ietf.org/html/rfc2616
 // RFC 7230: https://tools.ietf.org/html/rfc7230
 // "reason-phrase = *( HTAB / SP / VCHAR / obs-text )"
 bool isValidReasonPhrase(const String& statusText)
 {
     for (unsigned i = 0; i < statusText.length(); ++i) {
         UChar c = statusText[i];
         if (!(c == 0x09 // HTAB
@@ skipping 71 matching lines @@
         const long long length = blobData->length();
         Blob* blob = Blob::create(BlobDataHandle::create(blobData.release(), length));
         return create(context, blob, ResponseInit(responseInit, exceptionState), exceptionState);
     }
     ASSERT_NOT_REACHED();
     return nullptr;
 }
 
 Response* Response::create(ExecutionContext* context, Blob* body, const ResponseInit& responseInit, ExceptionState& exceptionState)
 {
-    // "1. If |init|'s status member is not in the range 200 to 599, throw a
+    unsigned short status = responseInit.status;
+
+    // "1. If |init|'s status member is not in the range 200 to 599, inclusive, throw a
     // RangeError."
-    if (responseInit.status < 200 || 599 < responseInit.status) {
-        exceptionState.throwRangeError("Invalid status");
+    if (status < 200 || 599 < status) {
+        exceptionState.throwRangeError(ExceptionMessages::indexOutsideRange<unsigned>("status", status, 200, ExceptionMessages::InclusiveBound, 599, ExceptionMessages::InclusiveBound));
         return 0;
     }
 
     // "2. If |init|'s statusText member does not match the Reason-Phrase
     // token production, throw a TypeError."
     if (!isValidReasonPhrase(responseInit.statusText)) {
         exceptionState.throwTypeError("Invalid statusText");
         return 0;
     }
 
@@ skipping 20 matching lines @@
         // "1. Empty |r|'s response's header list."
         r->m_response->headerList()->clearList();
         // "2. Fill |r|'s Headers object with |init|'s headers member. Rethrow
         // any exceptions."
         r->m_headers->fillWith(responseInit.headersDictionary, exceptionState);
         if (exceptionState.hadException())
             return 0;
     }
     // "7. If body is given, run these substeps:"
     if (body) {
-        // "1. Let |stream| and |Content-Type| be the result of extracting body."
-        // "2. Set |r|'s response's body to |stream|."
-        // "3. If |Content-Type| is non-null and |r|'s response's header list
+        // "1. If |init|'s status member is a null body status, throw a TypeError."
+        // "2. Let |stream| and |Content-Type| be the result of extracting body."
+        // "3. Set |r|'s response's body to |stream|."
+        // "4. If |Content-Type| is non-null and |r|'s response's header list
         // contains no header named `Content-Type`, append `Content-Type`/
         // |Content-Type| to |r|'s response's header list."
         // https://fetch.spec.whatwg.org/#concept-bodyinit-extract
         // Step 3, Blob:
         // "If object's type attribute is not the empty byte sequence, set
         // Content-Type to its value."
+        if (isNullBodyStatus(status)) {
+            exceptionState.throwTypeError("Response with null body status cannot have body");
+            return 0;
+        }
         r->m_response->replaceBodyStreamBuffer(new BodyStreamBuffer(FetchBlobDataConsumerHandle::create(context, body->blobDataHandle())));
         if (!body->type().isEmpty() && !r->m_response->headerList()->has("Content-Type"))
             r->m_response->headerList()->append("Content-Type", body->type());
     }
 
     // "8. Set |r|'s MIME type to the result of extracting a MIME type
     // from |r|'s response's header list."
     r->m_response->setMIMEType(r->m_response->headerList()->extractMIMEType());
 
     // "9. Return |r|."
@@ skipping 158 matching lines @@
 }
 
 DEFINE_TRACE(Response)
 {
     Body::trace(visitor);
     visitor->trace(m_response);
     visitor->trace(m_headers);
 }
 
 } // namespace blink