Normalize and update the header value checks to RFC 7230 for Fetch

third_party/WebKit/Source/modules/fetch/Headers.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/Headers.h"
 
 #include "bindings/core/v8/Dictionary.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/V8IteratorResultValue.h"
@@ skipping 88 matching lines @@
     FetchHeaderList* headerList = m_headerList->clone();
     Headers* headers = create(headerList);
     headers->m_guard = m_guard;
     return headers;
 }
 
 void Headers::append(const String& name, const String& value, ExceptionState& exceptionState)
 {
     // "To append a name/value (|name|/|value|) pair to a Headers object
     // (|headers|), run these steps:"
-    // "1. If |name| is not a name or |value| is not a value, throw a
+    // "1. Normalize |value|."
+    String normalizedValue = FetchUtils::normalizeHeaderValue(value);
+    // "2. If |name| is not a name or |value| is not a value, throw a
     //     TypeError."
     if (!FetchHeaderList::isValidHeaderName(name)) {
         exceptionState.throwTypeError("Invalid name");
         return;
     }
-    if (!FetchHeaderList::isValidHeaderValue(value)) {
+    if (!FetchHeaderList::isValidHeaderValueRFC7230(normalizedValue)) {
         exceptionState.throwTypeError("Invalid value");
         return;
     }
-    // "2. If guard is |request|, throw a TypeError."
+    // "3. If guard is |request|, throw a TypeError."
     if (m_guard == ImmutableGuard) {
         exceptionState.throwTypeError("Headers are immutable");
         return;
     }
-    // "3. Otherwise, if guard is |request| and |name| is a forbidden header
+    // "4. Otherwise, if guard is |request| and |name| is a forbidden header
     //     name, return."
     if (m_guard == RequestGuard && FetchUtils::isForbiddenHeaderName(name))
         return;
-    // "4. Otherwise, if guard is |request-no-CORS| and |name|/|value| is not a
+    // "5. Otherwise, if guard is |request-no-CORS| and |name|/|value| is not a
     //     simple header, return."
-    if (m_guard == RequestNoCORSGuard && !FetchUtils::isSimpleHeader(AtomicString(name), AtomicString(value)))
+    if (m_guard == RequestNoCORSGuard && !FetchUtils::isSimpleHeader(AtomicString(name), AtomicString(normalizedValue)))
         return;
-    // "5. Otherwise, if guard is |response| and |name| is a forbidden response
+    // "6. Otherwise, if guard is |response| and |name| is a forbidden response
     //     header name, return."
     if (m_guard == ResponseGuard && FetchUtils::isForbiddenResponseHeaderName(name))
         return;
-    // "6. Append |name|/|value| to header list."
-    m_headerList->append(name, value);
+    // "7. Append |name|/|value| to header list."
+    m_headerList->append(name, normalizedValue);
 }
 
 void Headers::remove(const String& name, ExceptionState& exceptionState)
 {
     // "The delete(|name|) method, when invoked, must run these steps:"
     // "1. If name is not a name, throw a TypeError."
     if (!FetchHeaderList::isValidHeaderName(name)) {
         exceptionState.throwTypeError("Invalid name");
         return;
     }
@@ skipping 57 matching lines @@
         return false;
     }
     // "2. Return true if there is a header in header list whose name is |name|,
     //     and false otherwise."
     return m_headerList->has(name);
 }
 
 void Headers::set(const String& name, const String& value, ExceptionState& exceptionState)
 {
     // "The set(|name|, |value|) method, when invoked, must run these steps:"
-    // "1. If |name| is not a name or |value| is not a value, throw a
+    // "1. Normalize |value|."
+    String normalizedValue = FetchUtils::normalizeHeaderValue(value);
+    // "2. If |name| is not a name or |value| is not a value, throw a
     //     TypeError."
     if (!FetchHeaderList::isValidHeaderName(name)) {
         exceptionState.throwTypeError("Invalid name");
         return;
     }
-    if (!FetchHeaderList::isValidHeaderValue(value)) {
+    if (!FetchHeaderList::isValidHeaderValueRFC7230(normalizedValue)) {
         exceptionState.throwTypeError("Invalid value");
         return;
     }
-    // "2. If guard is |immutable|, throw a TypeError."
+    // "3. If guard is |immutable|, throw a TypeError."
     if (m_guard == ImmutableGuard) {
         exceptionState.throwTypeError("Headers are immutable");
         return;
     }
-    // "3. Otherwise, if guard is |request| and |name| is a forbidden header
+    // "4. Otherwise, if guard is |request| and |name| is a forbidden header
     //     name, return."
     if (m_guard == RequestGuard && FetchUtils::isForbiddenHeaderName(name))
         return;
-    // "4. Otherwise, if guard is |request-no-CORS| and |name|/|value| is not a
+    // "5. Otherwise, if guard is |request-no-CORS| and |name|/|value| is not a
     //     simple header, return."
-    if (m_guard == RequestNoCORSGuard && !FetchUtils::isSimpleHeader(AtomicString(name), AtomicString(value)))
+    if (m_guard == RequestNoCORSGuard && !FetchUtils::isSimpleHeader(AtomicString(name), AtomicString(normalizedValue)))
         return;
-    // "5. Otherwise, if guard is |response| and |name| is a forbidden response
+    // "6. Otherwise, if guard is |response| and |name| is a forbidden response
     //     header name, return."
     if (m_guard == ResponseGuard && FetchUtils::isForbiddenResponseHeaderName(name))
         return;
-    // "6. Set |name|/|value| in header list."
-    m_headerList->set(name, value);
+    // "7. Set |name|/|value| in header list."
+    m_headerList->set(name, normalizedValue);
 }
 
 void Headers::fillWith(const Headers* object, ExceptionState& exceptionState)
 {
     ASSERT(m_headerList->size() == 0);
     // "To fill a Headers object (|this|) with a given object (|object|), run
     // these steps:"
     // "1. If |object| is a Headers object, copy its header list as
     //     |headerListCopy| and then for each |header| in |headerListCopy|,
     //     retaining order, append header's |name|/|header|'s value to
@@ skipping 68 matching lines @@
 {
     visitor->trace(m_headerList);
 }
 
 PairIterable<String, String>::IterationSource* Headers::startIteration(ScriptState*, ExceptionState&)
 {
     return new HeadersIterationSource(m_headerList);
 }
 
 } // namespace blink