QuicServer: Use Chrome's header parsing rather than Balsa

net/quic/quic_in_memory_cache.cc

Index: net/quic/quic_in_memory_cache.cc
diff --git a/net/quic/quic_in_memory_cache.cc b/net/quic/quic_in_memory_cache.cc
index 628fe9a5fa8a9d0d8ee0d11e83ff642710317ace..51395c368dec7cd26499abae6a9a1ebcf49c65f2 100644
--- a/net/quic/quic_in_memory_cache.cc
+++ b/net/quic/quic_in_memory_cache.cc
@@ -7,7 +7,8 @@
 #include "base/files/file_enumerator.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
-#include "net/tools/balsa/balsa_headers.h"
+#include "net/http/http_util.h"
+#include "net/quic/string_piece_utils.h"
 
 using base::FilePath;
 using base::StringPiece;
@@ -21,45 +22,12 @@ namespace net {
 
 FilePath::StringType g_quic_in_memory_cache_dir = FILE_PATH_LITERAL("");
 
-namespace {
-
-// BalsaVisitor implementation (glue) which caches response bodies.
-class CachingBalsaVisitor : public NoOpBalsaVisitor {
- public:
-  CachingBalsaVisitor() : done_framing_(false) {}
-  virtual void ProcessBodyData(const char* input, size_t size) OVERRIDE {
-    AppendToBody(input, size);
-  }
-  virtual void MessageDone() OVERRIDE {
-    done_framing_ = true;
-  }
-  virtual void HandleHeaderError(BalsaFrame* framer) OVERRIDE {
-    UnhandledError();
-  }
-  virtual void HandleHeaderWarning(BalsaFrame* framer) OVERRIDE {
-    UnhandledError();
-  }
-  virtual void HandleChunkingError(BalsaFrame* framer) OVERRIDE {
-    UnhandledError();
-  }
-  virtual void HandleBodyError(BalsaFrame* framer) OVERRIDE {
-    UnhandledError();
-  }
-  void UnhandledError() {
-    LOG(DFATAL) << "Unhandled error framing HTTP.";
-  }
-  void AppendToBody(const char* input, size_t size) {
-    body_.append(input, size);
-  }
-  bool done_framing() const { return done_framing_; }
-  const string& body() const { return body_; }
-
- private:
-  bool done_framing_;
-  string body_;
-};
+QuicInMemoryCache::Response::Response()
+    : response_type_(REGULAR_RESPONSE), headers_(NULL) {

[Ryan Hamilton, 2014/06/19 00:15:44]

One per line, unless the whole thing fits on one line. That being said, does
headers_ need to be explicitly initialized?

[dmz, 2014/06/19 21:17:02]

You're right, it does not.

+}
 
-}  // namespace
+QuicInMemoryCache::Response::~Response() {
+}
 
 // static
 QuicInMemoryCache* QuicInMemoryCache::GetInstance() {
@@ -67,8 +35,8 @@ QuicInMemoryCache* QuicInMemoryCache::GetInstance() {
 }
 
 const QuicInMemoryCache::Response* QuicInMemoryCache::GetResponse(
-    const BalsaHeaders& request_headers) const {
-  ResponseMap::const_iterator it = responses_.find(GetKey(request_headers));
+    const HttpRequestLine& request) const {
+  ResponseMap::const_iterator it = responses_.find(request.FullPath());
   if (it == responses_.end()) {
     return NULL;
   }
@@ -81,43 +49,41 @@ void QuicInMemoryCache::AddSimpleResponse(StringPiece method,
                                           StringPiece response_code,
                                           StringPiece response_detail,
                                           StringPiece body) {
-  BalsaHeaders request_headers, response_headers;
-  request_headers.SetRequestFirstlineFromStringPieces(method,
-                                                      path,
-                                                      version);
-  response_headers.SetRequestFirstlineFromStringPieces(version,
-                                                       response_code,
-                                                       response_detail);
-  response_headers.AppendHeader("content-length",
-                                base::IntToString(body.length()));
-
-  AddResponse(request_headers, response_headers, body);
+  HttpRequestLine request_line(method, path, version, "");
+
+  scoped_refptr<HttpResponseHeaders> response_headers =
+      new HttpResponseHeaders("");
+  response_headers->ReplaceStatusLine(response_code.as_string() + " " +
+                                      response_detail.as_string() + " " +
+                                      body.as_string());
+  response_headers->AddHeader("content-length: " +
+                              base::IntToString(body.length()));
+
+  AddResponse(request_line, response_headers, body);
 }
 
-void QuicInMemoryCache::AddResponse(const BalsaHeaders& request_headers,
-                                    const BalsaHeaders& response_headers,
-                                    StringPiece response_body) {
-  VLOG(1) << "Adding response for: " << GetKey(request_headers);
-  if (ContainsKey(responses_, GetKey(request_headers))) {
+void QuicInMemoryCache::AddResponse(
+    const HttpRequestLine& request_line,
+    scoped_refptr<HttpResponseHeaders> response_headers,
+    StringPiece response_body) {
+  VLOG(1) << "Adding response for: " << request_line.FullPath();
+  if (ContainsKey(responses_, request_line.FullPath())) {
     LOG(DFATAL) << "Response for given request already exists!";
     return;
   }
   Response* new_response = new Response();
   new_response->set_headers(response_headers);
   new_response->set_body(response_body);
-  responses_[GetKey(request_headers)] = new_response;
+  responses_[request_line.FullPath()] = new_response;
 }
 
 void QuicInMemoryCache::AddSpecialResponse(StringPiece method,
                                            StringPiece path,
                                            StringPiece version,
                                            SpecialResponseType response_type) {
-  BalsaHeaders request_headers, response_headers;
-  request_headers.SetRequestFirstlineFromStringPieces(method,
-                                                      path,
-                                                      version);
-  AddResponse(request_headers, response_headers, "");
-  responses_[GetKey(request_headers)]->response_type_ = response_type;
+  HttpRequestLine request_line(method, path, version, "");
+  AddResponse(request_line, new HttpResponseHeaders(""), "");
+  responses_[request_line.FullPath()]->response_type_ = response_type;
 }
 
 QuicInMemoryCache::QuicInMemoryCache() {
@@ -151,44 +117,30 @@ void QuicInMemoryCache::Initialize() {
       continue;
     }
 
-    BalsaHeaders request_headers, response_headers;
-
     string file_contents;
     base::ReadFileToString(file, &file_contents);
 
-    // Frame HTTP.
-    CachingBalsaVisitor caching_visitor;
-    BalsaFrame framer;
-    framer.set_balsa_headers(&response_headers);
-    framer.set_balsa_visitor(&caching_visitor);
-    size_t processed = 0;
-    while (processed < file_contents.length() &&
-           !caching_visitor.done_framing()) {
-      processed += framer.ProcessInput(file_contents.c_str() + processed,
-                                       file_contents.length() - processed);
+    int headers_end = HttpUtil::LocateEndOfHeaders(file_contents.c_str(),
+                                                   file_contents.size());
+    if (headers_end < 1) {
+      LOG(DFATAL) << "Could not find end of headers in file: " << file.value();
     }
 
-    string response_headers_str;
-    response_headers.DumpToString(&response_headers_str);
-    if (!caching_visitor.done_framing()) {
-      LOG(DFATAL) << "Did not frame entire message from file: " << file.value()
-                  << " (" << processed << " of " << file_contents.length()
-                  << " bytes).";
-    }
-    if (processed < file_contents.length()) {
-      // Didn't frame whole file. Assume remainder is body.
-      // This sometimes happens as a result of incompatibilities between
-      // BalsaFramer and wget's serialization of HTTP sans content-length.
-      caching_visitor.AppendToBody(file_contents.c_str() + processed,
-                                   file_contents.length() - processed);
-      processed += file_contents.length();
-    }
+    string raw_headers =
+        HttpUtil::AssembleRawHeaders(file_contents.c_str(), headers_end);
+
+    scoped_refptr<HttpResponseHeaders> response_headers =
+        new HttpResponseHeaders(raw_headers);
 
-    string utf8_file = file.AsUTF8Unsafe();
-    StringPiece base = utf8_file;
-    if (response_headers.HasHeader("X-Original-Url")) {
-      base = response_headers.GetHeader("X-Original-Url");
-      response_headers.RemoveAllOfHeader("X-Original-Url");
+    string base_str;
+    StringPiece base;
+    if (response_headers->HasHeader("X-Original-Url")) {
+      if (!response_headers->GetNormalizedHeader("X-Original-Url", &base_str)) {
+        LOG(DFATAL) << "Failed to read X-Original-Url in file: "
+                    << file.value();
+      }
+      base = base_str;
+      response_headers->RemoveHeader("X-Original-Url");
       // Remove the protocol so that the string is of the form host + path,
       // which is parsed properly below.
       if (StringPieceUtils::StartsWithIgnoreCase(base, "https://")) {
@@ -196,6 +148,9 @@ void QuicInMemoryCache::Initialize() {
       } else if (StringPieceUtils::StartsWithIgnoreCase(base, "http://")) {
         base.remove_prefix(7);
       }
+    } else {
+      base_str = file.AsUTF8Unsafe();
+      base = base_str;
     }
     int path_start = base.find_first_of('/');
     DCHECK_LT(0, path_start);
@@ -205,15 +160,15 @@ void QuicInMemoryCache::Initialize() {
       path.remove_suffix(1);
     }
     // Set up request headers. Assume method is GET and protocol is HTTP/1.1.
-    request_headers.SetRequestFirstlineFromStringPieces("GET",
-                                                        path,
-                                                        "HTTP/1.1");
-    request_headers.ReplaceOrAppendHeader("host", host);
+    HttpRequestLine request_line("GET", path, "HTTP/1.1", host);
 
-    VLOG(1) << "Inserting 'http://" << GetKey(request_headers)
+    VLOG(1) << "Inserting 'http://" << request_line.FullPath()
             << "' into QuicInMemoryCache.";
 
-    AddResponse(request_headers, response_headers, caching_visitor.body());
+    StringPiece body(file_contents.c_str() + headers_end,
+                     file_contents.size() - headers_end);
+
+    AddResponse(request_line, response_headers, body);
 
     file = file_list.Next();
   }
@@ -223,20 +178,4 @@ QuicInMemoryCache::~QuicInMemoryCache() {
   STLDeleteValues(&responses_);
 }
 
-string QuicInMemoryCache::GetKey(const BalsaHeaders& request_headers) const {
-  StringPiece uri = request_headers.request_uri();
-  if (uri.size() == 0) {
-    return "";
-  }
-  StringPiece host;
-  if (uri[0] == '/') {
-    host = request_headers.GetHeader("host");
-  } else if (StringPieceUtils::StartsWithIgnoreCase(uri, "https://")) {
-    uri.remove_prefix(8);
-  } else if (StringPieceUtils::StartsWithIgnoreCase(uri, "http://")) {
-    uri.remove_prefix(7);
-  }
-  return host.as_string() + uri.as_string();
-}
-
 }  // namespace net