Revert 54528 - Digest authentication uses a uri field to prevent replay attac...

net/http/http_network_transaction.cc

 // Copyright (c) 2010 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/http_network_transaction.h"
 
 #include <set>
 #include <vector>
 
 #include "base/compiler_specific.h"
@@ skipping 176 matching lines @@
     const HttpAlternateProtocols::PortProtocolPair existing_alternate =
         alternate_protocols->GetAlternateProtocolFor(host_port);
     // If we think the alternate protocol is broken, don't change it.
     if (existing_alternate.protocol == HttpAlternateProtocols::BROKEN)
       return;
   }
 
   alternate_protocols->SetAlternateProtocolFor(host_port, port, protocol);
 }
 
-GURL UpgradeUrlToHttps(const GURL& original_url) {
-  GURL::Replacements replacements;
-  // new_sheme and new_port need to be in scope here because GURL::Replacements
-  // references the memory contained by them directly.
-  const std::string new_scheme = "https";
-  const std::string new_port = IntToString(443);
-  replacements.SetSchemeStr(new_scheme);
-  replacements.SetPortStr(new_port);
-  return original_url.ReplaceComponents(replacements);
-}
-
 }  // namespace
 
 //-----------------------------------------------------------------------------
 
 bool HttpNetworkTransaction::g_ignore_certificate_errors = false;
 
 HttpNetworkTransaction::HttpNetworkTransaction(HttpNetworkSession* session)
     : pending_auth_target_(HttpAuth::AUTH_NONE),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           io_callback_(this, &HttpNetworkTransaction::OnIOComplete)),
@@ skipping 468 matching lines @@
     if (alternate_protocol_mode_ == kUnspecified) {
       HttpAlternateProtocols::PortProtocolPair alternate =
           alternate_protocols.GetAlternateProtocolFor(endpoint_);
       if (alternate.protocol != HttpAlternateProtocols::BROKEN) {
         DCHECK_LE(HttpAlternateProtocols::NPN_SPDY_1, alternate.protocol);
         DCHECK_GT(HttpAlternateProtocols::NUM_ALTERNATE_PROTOCOLS,
                   alternate.protocol);
         endpoint_.set_port(alternate.port);
         alternate_protocol_ = alternate.protocol;
         alternate_protocol_mode_ = kUsingAlternateProtocol;
-        alternate_endpoint_url = UpgradeUrlToHttps(*curr_endpoint_url);
+
+        url_canon::Replacements<char> replacements;
+        replacements.SetScheme("https",
+                               url_parse::Component(0, strlen("https")));
+        const std::string port_str = base::IntToString(endpoint_.port());
+        replacements.SetPort(port_str.c_str(),
+                             url_parse::Component(0, port_str.size()));
+        alternate_endpoint_url =
+            curr_endpoint_url->ReplaceComponents(replacements);
         curr_endpoint_url = &alternate_endpoint_url;
       }
     }
   }
 
   if (request_->load_flags & LOAD_BYPASS_PROXY) {
     proxy_info_.UseDirect();
     return OK;
   }
 
@@ skipping 69 matching lines @@
                                      request_->referrer,
                                      disable_resolver_cache);
   } else {
     ProxyServer proxy_server = proxy_info_.proxy_server();
     proxy_host_port.reset(new HostPortPair(proxy_server.host_port_pair()));
     scoped_refptr<TCPSocketParams> proxy_tcp_params =
         new TCPSocketParams(*proxy_host_port, request_->priority,
                             request_->referrer, disable_resolver_cache);
 
     if (proxy_info_.is_http()) {
-      GURL authentication_url = request_->url;
-      if (using_ssl_) {
-        if (!authentication_url.SchemeIs("https")) {
-          // If a proxy tunnel connection needs to be established due to
-          // an Alternate-Protocol, the URL needs to be changed to indicate
-          // https or digest authentication attempts will fail.
-          // For example, suppose the initial request was for
-          // "http://www.example.com/index.html". If this is an SSL
-          // upgrade due to alternate protocol, the digest authorization
-          // should have a uri="www.example.com:443" field rather than a
-          // "/index.html" entry, even though the original request URL has not
-          // changed.
-          authentication_url = UpgradeUrlToHttps(authentication_url);
-        }
-      }
       establishing_tunnel_ = using_ssl_;
       http_proxy_params = new HttpProxySocketParams(proxy_tcp_params,
-                                                    authentication_url,
-                                                    endpoint_,
+                                                    request_->url, endpoint_,
                                                     session_, using_ssl_);
     } else {
       DCHECK(proxy_info_.is_socks());
       char socks_version;
       if (proxy_server.scheme() == ProxyServer::SCHEME_SOCKS5)
         socks_version = '5';
       else
         socks_version = '4';
       connection_group =
           StringPrintf("socks%c/%s", socks_version, connection_group.c_str());
@@ skipping 1115 matching lines @@
     default:
       return priority;
   }
 }
 
 
 
 #undef STATE_CASE
 
 }  // namespace net