Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(254)

Side by Side Diff: net/http/http_proxy_utils.cc

Issue 8502024: Allow chrome to handle 407 auth challenges to CONNECT requests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: fix typo in unittest Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/http/http_proxy_utils.h ('k') | net/http/http_stream_factory_impl_job.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/http/http_proxy_utils.h" 5 #include "net/http/http_proxy_utils.h"
6 6
7 #include "base/logging.h"
7 #include "base/stringprintf.h" 8 #include "base/stringprintf.h"
8 #include "googleurl/src/gurl.h" 9 #include "googleurl/src/gurl.h"
9 #include "net/base/host_port_pair.h" 10 #include "net/base/host_port_pair.h"
11 #include "net/base/net_errors.h"
10 #include "net/base/net_util.h" 12 #include "net/base/net_util.h"
13 #include "net/http/http_auth_controller.h"
11 #include "net/http/http_request_info.h" 14 #include "net/http/http_request_info.h"
15 #include "net/http/http_response_headers.h"
16 #include "net/http/http_response_info.h"
12 17
13 namespace net { 18 namespace net {
14 19
15 void BuildTunnelRequest( 20 void BuildTunnelRequest(
16 const HttpRequestInfo& request_info, 21 const HttpRequestInfo& request_info,
17 const HttpRequestHeaders& auth_headers, 22 const HttpRequestHeaders& auth_headers,
18 const HostPortPair& endpoint, 23 const HostPortPair& endpoint,
19 std::string* request_line, 24 std::string* request_line,
20 HttpRequestHeaders* request_headers) { 25 HttpRequestHeaders* request_headers) {
21 // RFC 2616 Section 9 says the Host request-header field MUST accompany all 26 // RFC 2616 Section 9 says the Host request-header field MUST accompany all
22 // HTTP/1.1 requests. Add "Proxy-Connection: keep-alive" for compat with 27 // HTTP/1.1 requests. Add "Proxy-Connection: keep-alive" for compat with
23 // HTTP/1.0 proxies such as Squid (required for NTLM authentication). 28 // HTTP/1.0 proxies such as Squid (required for NTLM authentication).
24 *request_line = StringPrintf( 29 *request_line = StringPrintf(
25 "CONNECT %s HTTP/1.1\r\n", endpoint.ToString().c_str()); 30 "CONNECT %s HTTP/1.1\r\n", endpoint.ToString().c_str());
26 request_headers->SetHeader(HttpRequestHeaders::kHost, 31 request_headers->SetHeader(HttpRequestHeaders::kHost,
27 GetHostAndOptionalPort(request_info.url)); 32 GetHostAndOptionalPort(request_info.url));
28 request_headers->SetHeader(HttpRequestHeaders::kProxyConnection, 33 request_headers->SetHeader(HttpRequestHeaders::kProxyConnection,
29 "keep-alive"); 34 "keep-alive");
30 35
31 std::string user_agent; 36 std::string user_agent;
32 if (request_info.extra_headers.GetHeader(HttpRequestHeaders::kUserAgent, 37 if (request_info.extra_headers.GetHeader(HttpRequestHeaders::kUserAgent,
33 &user_agent)) 38 &user_agent))
34 request_headers->SetHeader(HttpRequestHeaders::kUserAgent, user_agent); 39 request_headers->SetHeader(HttpRequestHeaders::kUserAgent, user_agent);
35 40
36 request_headers->MergeFrom(auth_headers); 41 request_headers->MergeFrom(auth_headers);
37 } 42 }
38 43
44 int HandleAuthChallenge(HttpAuthController* auth,
45 HttpResponseInfo* response,
46 const BoundNetLog& net_log) {
47 DCHECK(response->headers);
48
49 int rv = auth->HandleAuthChallenge(response->headers, false, true, net_log);
50 response->auth_challenge = auth->auth_info();
51 if (rv == OK)
52 return ERR_PROXY_AUTH_REQUESTED;
53
54 return rv;
55 }
56
39 } // namespace net 57 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_proxy_utils.h ('k') | net/http/http_stream_factory_impl_job.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698