Pull HTTP/2 header parsing into utility method, from QuicSpdy{Client,Server}Streams. Not used in pr…

net/tools/quic/quic_spdy_server_stream.cc

 // Copyright (c) 2012 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/tools/quic/quic_spdy_server_stream.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
@@ skipping 14 matching lines @@
 
 QuicSpdyServerStream::QuicSpdyServerStream(QuicStreamId id,
                                            QuicSpdySession* session)
     : QuicSpdyStream(id, session), content_length_(-1) {}
 
 QuicSpdyServerStream::~QuicSpdyServerStream() {
 }
 
 void QuicSpdyServerStream::OnStreamHeadersComplete(bool fin, size_t frame_len) {
   QuicSpdyStream::OnStreamHeadersComplete(fin, frame_len);
-  if (!ParseRequestHeaders(decompressed_headers().data(),
-                           decompressed_headers().length())) {
+  if (!SpdyUtils::ParseHeaders(decompressed_headers().data(),
+                               decompressed_headers().length(),
+                               &content_length_, &request_headers_)) {
     DVLOG(1) << "Invalid headers";
     SendErrorResponse();
   }
   MarkHeadersConsumed(decompressed_headers().length());
 }
 
 void QuicSpdyServerStream::OnDataAvailable() {
   while (HasBytesToRead()) {
     struct iovec iov;
     if (GetReadableRegions(&iov, 1) == 0) {
@@ skipping 35 matching lines @@
       content_length_ != static_cast<int>(body_.size())) {
     DVLOG(1) << "Content length (" << content_length_ << ") != body size ("
              << body_.size() << ").";
     SendErrorResponse();
     return;
   }
 
   SendResponse();
 }
 
-bool QuicSpdyServerStream::ParseRequestHeaders(const char* data,
-                                               uint32 data_len) {
-  DCHECK(headers_decompressed());
-  SpdyFramer framer(HTTP2);
-  if (!framer.ParseHeaderBlockInBuffer(data, data_len, &request_headers_) ||
-      request_headers_.empty()) {
-    return false;  // Headers were invalid.
-  }
-
-  if (ContainsKey(request_headers_, "content-length")) {
-    string delimiter;
-    delimiter.push_back('\0');
-    std::vector<string> values =
-        base::SplitString(request_headers_["content-length"], delimiter,
-                          base::KEEP_WHITESPACE, base::SPLIT_WANT_ALL);
-
-    for (const string& value : values) {
-      int new_value;
-      if (!StringToInt(value, &new_value) || new_value < 0) {
-        return false;
-      }
-      if (content_length_ < 0) {
-        content_length_ = new_value;
-        continue;
-      }
-      if (new_value != content_length_) {
-        return false;
-      }
-    }
-  }
-
-  return true;
-}
-
 void QuicSpdyServerStream::SendResponse() {
   if (!ContainsKey(request_headers_, ":authority") ||
       !ContainsKey(request_headers_, ":path")) {
     DVLOG(1) << "Request headers do not contain :authority or :path.";
     SendErrorResponse();
     return;
   }
 
   // Find response in cache. If not found, send error response.
   const QuicInMemoryCache::Response* response =
@@ skipping 68 matching lines @@
 
   if (!body.empty()) {
     WriteOrBufferData(body, true, nullptr);
   }
 }
 
 const char* const QuicSpdyServerStream::kErrorResponseBody = "bad";
 
 }  // namespace tools
 }  // namespace net