SanitizeProxyAuth: Whitelist all hop-by-hop headers

net/http/proxy_client_socket.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/http/proxy_client_socket.h"
 
 #include "base/metrics/histogram.h"
 #include "base/strings/stringprintf.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/net_errors.h"
@@ skipping 77 matching lines @@
 // static
 bool ProxyClientSocket::SanitizeProxyAuth(HttpResponseInfo* response) {
   DCHECK(response && response->headers.get());
 
   scoped_refptr<HttpResponseHeaders> old_headers = response->headers;
 
   const char kHeaders[] = "HTTP/1.1 407 Proxy Authentication Required\n\n";
   scoped_refptr<HttpResponseHeaders> new_headers = new HttpResponseHeaders(
       HttpUtil::AssembleRawHeaders(kHeaders, arraysize(kHeaders)));
 
+  // Copy status line and all hop-by-hop headers to preserve keep-alive
+  // behavior.
   new_headers->ReplaceStatusLine(old_headers->GetStatusLine());
-  CopyHeaderValues(old_headers, new_headers, "Connection");
-  CopyHeaderValues(old_headers, new_headers, "Proxy-Authenticate");
+  CopyHeaderValues(old_headers, new_headers, "connection");
+  CopyHeaderValues(old_headers, new_headers, "proxy-connection");
+  CopyHeaderValues(old_headers, new_headers, "keep-alive");
+  CopyHeaderValues(old_headers, new_headers, "trailer");
+  CopyHeaderValues(old_headers, new_headers, "transfer-encoding");
+  CopyHeaderValues(old_headers, new_headers, "upgrade");
+
+  CopyHeaderValues(old_headers, new_headers, "content-length");

[cbentzel, 2015/03/05 02:08:48]

As we chatted, main thing I want to make sure is that this drains the body
between rounds of authentication but doesn't actually run the body when the user
cancels doing another round of auth. Provided that works, OK.

+
+  CopyHeaderValues(old_headers, new_headers, "proxy-authenticate");
 
   response->headers = new_headers;
   return true;
 }
 
 // static
 bool ProxyClientSocket::SanitizeProxyRedirect(HttpResponseInfo* response) {
   DCHECK(response && response->headers.get());
 
   std::string location;
@@ skipping 10 matching lines @@
       location.c_str());
   std::string raw_headers =
       HttpUtil::AssembleRawHeaders(fake_response_headers.data(),
                                    fake_response_headers.length());
   response->headers = new HttpResponseHeaders(raw_headers);
 
   return true;
 }
 
 }  // namespace net