relnote: change ExtractContentLengthFromHeaders to return false if content-length is missing. If th…

net/quic/core/spdy_utils.cc

 // Copyright (c) 2013 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 "net/quic/core/spdy_utils.h"
 
 #include <memory>
 #include <vector>
 
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "net/spdy/spdy_flags.h"
 #include "net/spdy/spdy_frame_builder.h"
 #include "net/spdy/spdy_framer.h"
 #include "net/spdy/spdy_protocol.h"
 #include "url/gurl.h"
 
 using base::StringPiece;
+using base::ContainsKey;
 using std::string;
 using std::vector;
 
 namespace net {
 
 // static
 string SpdyUtils::SerializeUncompressedHeaders(const SpdyHeaderBlock& headers) {
   SpdyMajorVersion spdy_version = HTTP2;
 
   size_t length = SpdyFramer::GetSerializedLength(spdy_version, &headers);
   SpdyFrameBuilder builder(length, spdy_version);
   SpdyFramer framer(spdy_version);
   framer.SerializeHeaderBlockWithoutCompression(&builder, headers);
   SpdySerializedFrame block(builder.take());
   return string(block.data(), length);
 }
 
 // static
 bool SpdyUtils::ParseHeaders(const char* data,
                              uint32_t data_len,
                              int64_t* content_length,
                              SpdyHeaderBlock* headers) {
   SpdyFramer framer(HTTP2);
   if (!framer.ParseHeaderBlockInBuffer(data, data_len, headers) ||
       headers->empty()) {
     return false;  // Headers were invalid.
   }
 
+  if (!ContainsKey(*headers, "content-length")) {
+    return true;
+  }
+
   return ExtractContentLengthFromHeaders(content_length, headers);
 }
 
 // static
 bool SpdyUtils::ExtractContentLengthFromHeaders(int64_t* content_length,
                                                 SpdyHeaderBlock* headers) {
-  if (base::ContainsKey(*headers, "content-length")) {
-    // Check whether multiple values are consistent.
-    base::StringPiece content_length_header = (*headers)["content-length"];
-    vector<string> values =
-        base::SplitString(content_length_header, base::StringPiece("\0", 1),
-                          base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
-    for (const string& value : values) {
-      int64_t new_value;
-      if (!base::StringToInt64(value, &new_value) || new_value < 0) {
-        DLOG(ERROR) << "Content length was either unparseable or negative.";
-        return false;
-      }
-      if (*content_length < 0) {
-        *content_length = new_value;
-        continue;
-      }
-      if (new_value != *content_length) {
-        DLOG(ERROR) << "Parsed content length " << new_value << " is "
-                    << "inconsistent with previously detected content length "
-                    << *content_length;
-        return false;
-      }
+  if (!ContainsKey(*headers, "content-length")) {
+    return false;
+  }
+  // Check whether multiple values are consistent.
+  base::StringPiece content_length_header = (*headers)["content-length"];
+  vector<string> values =
+      base::SplitString(content_length_header, base::StringPiece("\0", 1),
+                        base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+  for (const string& value : values) {
+    int64_t new_value;
+    if (!base::StringToInt64(value, &new_value) || new_value < 0) {
+      DLOG(ERROR) << "Content length was either unparseable or negative.";
+      return false;
+    }
+    if (*content_length < 0) {
+      *content_length = new_value;
+      continue;
+    }
+    if (new_value != *content_length) {
+      DLOG(ERROR) << "Parsed content length " << new_value << " is "
+                  << "inconsistent with previously detected content length "
+                  << *content_length;
+      return false;
     }
   }
   return true;
 }
 
 // static
 bool SpdyUtils::ParseTrailers(const char* data,
                               uint32_t data_len,
                               size_t* final_byte_offset,
                               SpdyHeaderBlock* trailers) {
@@ skipping 44 matching lines @@
 
     if (std::any_of(name.begin(), name.end(), base::IsAsciiUpper<char>)) {
       DVLOG(1) << "Malformed header: Header name " << name
                << " contains upper-case characters.";
       return false;
     }
 
     headers->AppendValueOrAddHeader(name, p.second);
   }
 
-  if (!ExtractContentLengthFromHeaders(content_length, headers)) {
+  if (ContainsKey(*headers, "content-length") &&
+      !ExtractContentLengthFromHeaders(content_length, headers)) {
     return false;
   }
 
   DVLOG(1) << "Successfully parsed headers: " << headers->DebugString();
   return true;
 }
 
 bool SpdyUtils::CopyAndValidateTrailers(const QuicHeaderList& header_list,
                                         size_t* final_byte_offset,
                                         SpdyHeaderBlock* trailers) {
@@ skipping 90 matching lines @@
   pos = url.find("/", start);
   if (pos == string::npos) {
     return false;
   }
   (*headers)[":authority"] = url.substr(start, pos - start);
   (*headers)[":path"] = url.substr(pos);
   return true;
 }
 
 }  // namespace net