Escape non-ASCII response headers.

net/http/http_response_headers.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.
 
 // The rules for header parsing were borrowed from Firefox:
 // http://lxr.mozilla.org/seamonkey/source/netwerk/protocol/http/src/nsHttpResponseHead.cpp
 // The rules for parsing content-types were also borrowed from Firefox:
 // http://lxr.mozilla.org/mozilla/source/netwerk/base/src/nsURLHelper.cpp#834
 
 #include "net/http/http_response_headers.h"
@@ skipping 1337 matching lines @@
 base::Value* HttpResponseHeaders::NetLogCallback(
     NetLog::LogLevel log_level) const {
   base::DictionaryValue* dict = new base::DictionaryValue();
   base::ListValue* headers = new base::ListValue();
   headers->Append(new base::StringValue(GetStatusLine()));
   void* iterator = NULL;
   std::string name;
   std::string value;
   while (EnumerateHeaderLines(&iterator, &name, &value)) {
     std::string log_value = ElideHeaderValueForNetLog(log_level, name, value);
+    std::string escaped_name = EscapeNonASCII(name);
+    std::string escaped_value = EscapeNonASCII(log_value);
     headers->Append(
       new base::StringValue(
-          base::StringPrintf("%s: %s", name.c_str(), log_value.c_str())));
+          base::StringPrintf("%s: %s", escaped_name.c_str(),

[davidben, 2014/08/07 17:36:36]

Header names and values are "supposed to be" treated as latin1, so doing a
latin1 to utf8 might be better. Looks like we have a net/base/net_string_util.h
which defines a net::ConvertToUtf8 and kCharsetLatin1. There's other code in
net/ which uses ConvertToUtf8AndNormalize, so that seems fine.

[Elly Fong-Jones, 2014/08/07 19:41:37]

Acknowledged.

+                             escaped_value.c_str())));
   }
   dict->Set("headers", headers);
   return dict;
 }
 
 // static
 bool HttpResponseHeaders::FromNetLogParam(
     const base::Value* event_param,
     scoped_refptr<HttpResponseHeaders>* http_response_headers) {
   *http_response_headers = NULL;
@@ skipping 23 matching lines @@
   return true;
 }
 
 bool HttpResponseHeaders::IsChunkEncoded() const {
   // Ignore spurious chunked responses from HTTP/1.0 servers and proxies.
   return GetHttpVersion() >= HttpVersion(1, 1) &&
       HasHeaderValue("Transfer-Encoding", "chunked");
 }
 
 }  // namespace net