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

Side by Side Diff: content/browser/loader/resource_loader.cc

Issue 42773002: Get ClientCertStore through ResourceContext. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: changes for comments #4 and #5 Created 7 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/browser/loader/resource_loader.h" 5 #include "content/browser/loader/resource_loader.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/time/time.h" 10 #include "base/time/time.h"
11 #include "content/browser/child_process_security_policy_impl.h" 11 #include "content/browser/child_process_security_policy_impl.h"
12 #include "content/browser/loader/cross_site_resource_handler.h" 12 #include "content/browser/loader/cross_site_resource_handler.h"
13 #include "content/browser/loader/resource_loader_delegate.h" 13 #include "content/browser/loader/resource_loader_delegate.h"
14 #include "content/browser/loader/resource_request_info_impl.h" 14 #include "content/browser/loader/resource_request_info_impl.h"
15 #include "content/browser/ssl/ssl_client_auth_handler.h" 15 #include "content/browser/ssl/ssl_client_auth_handler.h"
16 #include "content/browser/ssl/ssl_manager.h" 16 #include "content/browser/ssl/ssl_manager.h"
17 #include "content/common/ssl_status_serialization.h" 17 #include "content/common/ssl_status_serialization.h"
18 #include "content/public/browser/cert_store.h" 18 #include "content/public/browser/cert_store.h"
19 #include "content/public/browser/resource_dispatcher_host_login_delegate.h" 19 #include "content/public/browser/resource_dispatcher_host_login_delegate.h"
20 #include "content/public/browser/site_instance.h" 20 #include "content/public/browser/site_instance.h"
21 #include "content/public/common/content_client.h" 21 #include "content/public/common/content_client.h"
22 #include "content/public/common/content_switches.h" 22 #include "content/public/common/content_switches.h"
23 #include "content/public/common/process_type.h" 23 #include "content/public/common/process_type.h"
24 #include "content/public/common/resource_response.h" 24 #include "content/public/common/resource_response.h"
25 #include "content/public/common/url_constants.h" 25 #include "content/public/common/url_constants.h"
26 #include "net/base/io_buffer.h" 26 #include "net/base/io_buffer.h"
27 #include "net/base/load_flags.h" 27 #include "net/base/load_flags.h"
28 #include "net/http/http_response_headers.h" 28 #include "net/http/http_response_headers.h"
29 #include "net/ssl/client_cert_store.h"
30 #include "net/ssl/client_cert_store_impl.h"
31 #include "webkit/browser/appcache/appcache_interceptor.h" 29 #include "webkit/browser/appcache/appcache_interceptor.h"
32 30
33 using base::TimeDelta; 31 using base::TimeDelta;
34 using base::TimeTicks; 32 using base::TimeTicks;
35 33
36 namespace content { 34 namespace content {
37 namespace { 35 namespace {
38 36
39 void PopulateResourceResponse(net::URLRequest* request, 37 void PopulateResourceResponse(net::URLRequest* request,
40 ResourceResponse* response) { 38 ResourceResponse* response) {
(...skipping 19 matching lines...) Expand all
60 // TODO(mmenke): Figure out if LOAD_ENABLE_LOAD_TIMING is safe to remove. 58 // TODO(mmenke): Figure out if LOAD_ENABLE_LOAD_TIMING is safe to remove.
61 if (request->load_flags() & net::LOAD_ENABLE_LOAD_TIMING) 59 if (request->load_flags() & net::LOAD_ENABLE_LOAD_TIMING)
62 request->GetLoadTimingInfo(&response->head.load_timing); 60 request->GetLoadTimingInfo(&response->head.load_timing);
63 } 61 }
64 62
65 } // namespace 63 } // namespace
66 64
67 ResourceLoader::ResourceLoader(scoped_ptr<net::URLRequest> request, 65 ResourceLoader::ResourceLoader(scoped_ptr<net::URLRequest> request,
68 scoped_ptr<ResourceHandler> handler, 66 scoped_ptr<ResourceHandler> handler,
69 ResourceLoaderDelegate* delegate) 67 ResourceLoaderDelegate* delegate)
70 : weak_ptr_factory_(this) { 68 : deferred_stage_(DEFERRED_NONE),
71 scoped_ptr<net::ClientCertStore> client_cert_store; 69 request_(request.Pass()),
72 #if !defined(USE_OPENSSL) 70 handler_(handler.Pass()),
73 client_cert_store.reset(new net::ClientCertStoreImpl()); 71 delegate_(delegate),
74 #endif 72 last_upload_position_(0),
75 Init(request.Pass(), handler.Pass(), delegate, client_cert_store.Pass()); 73 waiting_for_upload_progress_ack_(false),
74 is_transferring_(false),
75 weak_ptr_factory_(this) {
76 request_->set_delegate(this);
77 handler_->SetController(this);
76 } 78 }
77 79
78 ResourceLoader::~ResourceLoader() { 80 ResourceLoader::~ResourceLoader() {
79 if (login_delegate_.get()) 81 if (login_delegate_.get())
80 login_delegate_->OnRequestCancelled(); 82 login_delegate_->OnRequestCancelled();
81 if (ssl_client_auth_handler_.get()) 83 if (ssl_client_auth_handler_.get())
82 ssl_client_auth_handler_->OnRequestCancelled(); 84 ssl_client_auth_handler_->OnRequestCancelled();
83 85
84 // Run ResourceHandler destructor before we tear-down the rest of our state 86 // Run ResourceHandler destructor before we tear-down the rest of our state
85 // as the ResourceHandler may want to inspect the URLRequest and other state. 87 // as the ResourceHandler may want to inspect the URLRequest and other state.
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 } 184 }
183 185
184 void ResourceLoader::ClearSSLClientAuthHandler() { 186 void ResourceLoader::ClearSSLClientAuthHandler() {
185 ssl_client_auth_handler_ = NULL; 187 ssl_client_auth_handler_ = NULL;
186 } 188 }
187 189
188 void ResourceLoader::OnUploadProgressACK() { 190 void ResourceLoader::OnUploadProgressACK() {
189 waiting_for_upload_progress_ack_ = false; 191 waiting_for_upload_progress_ack_ = false;
190 } 192 }
191 193
192 ResourceLoader::ResourceLoader(
193 scoped_ptr<net::URLRequest> request,
194 scoped_ptr<ResourceHandler> handler,
195 ResourceLoaderDelegate* delegate,
196 scoped_ptr<net::ClientCertStore> client_cert_store)
197 : weak_ptr_factory_(this) {
198 Init(request.Pass(), handler.Pass(), delegate, client_cert_store.Pass());
199 }
200
201 void ResourceLoader::Init(scoped_ptr<net::URLRequest> request,
202 scoped_ptr<ResourceHandler> handler,
203 ResourceLoaderDelegate* delegate,
204 scoped_ptr<net::ClientCertStore> client_cert_store) {
205 deferred_stage_ = DEFERRED_NONE;
206 request_ = request.Pass();
207 handler_ = handler.Pass();
208 delegate_ = delegate;
209 last_upload_position_ = 0;
210 waiting_for_upload_progress_ack_ = false;
211 is_transferring_ = false;
212 client_cert_store_ = client_cert_store.Pass();
213
214 request_->set_delegate(this);
215 handler_->SetController(this);
216 }
217
218 void ResourceLoader::OnReceivedRedirect(net::URLRequest* unused, 194 void ResourceLoader::OnReceivedRedirect(net::URLRequest* unused,
219 const GURL& new_url, 195 const GURL& new_url,
220 bool* defer) { 196 bool* defer) {
221 DCHECK_EQ(request_.get(), unused); 197 DCHECK_EQ(request_.get(), unused);
222 198
223 VLOG(1) << "OnReceivedRedirect: " << request_->url().spec(); 199 VLOG(1) << "OnReceivedRedirect: " << request_->url().spec();
224 DCHECK(request_->status().is_success()); 200 DCHECK(request_->status().is_success());
225 201
226 ResourceRequestInfoImpl* info = GetRequestInfo(); 202 ResourceRequestInfoImpl* info = GetRequestInfo();
227 203
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 void ResourceLoader::OnCertificateRequested( 258 void ResourceLoader::OnCertificateRequested(
283 net::URLRequest* unused, 259 net::URLRequest* unused,
284 net::SSLCertRequestInfo* cert_info) { 260 net::SSLCertRequestInfo* cert_info) {
285 DCHECK_EQ(request_.get(), unused); 261 DCHECK_EQ(request_.get(), unused);
286 262
287 if (!delegate_->AcceptSSLClientCertificateRequest(this, cert_info)) { 263 if (!delegate_->AcceptSSLClientCertificateRequest(this, cert_info)) {
288 request_->Cancel(); 264 request_->Cancel();
289 return; 265 return;
290 } 266 }
291 267
292 #if !defined(USE_OPENSSL)
293 client_cert_store_->GetClientCerts(*cert_info, &cert_info->client_certs);
294 if (cert_info->client_certs.empty()) {
295 // No need to query the user if there are no certs to choose from.
296 request_->ContinueWithCertificate(NULL);
297 return;
298 }
299 #endif
300
301 DCHECK(!ssl_client_auth_handler_.get()) 268 DCHECK(!ssl_client_auth_handler_.get())
302 << "OnCertificateRequested called with ssl_client_auth_handler pending"; 269 << "OnCertificateRequested called with ssl_client_auth_handler pending";
303 ssl_client_auth_handler_ = new SSLClientAuthHandler(request_.get(), 270 ssl_client_auth_handler_ = new SSLClientAuthHandler(
304 cert_info); 271 GetRequestInfo()->GetContext(), request_.get(), cert_info);
305 ssl_client_auth_handler_->SelectCertificate(); 272 ssl_client_auth_handler_->SelectCertificate();
306 } 273 }
307 274
308 void ResourceLoader::OnSSLCertificateError(net::URLRequest* request, 275 void ResourceLoader::OnSSLCertificateError(net::URLRequest* request,
309 const net::SSLInfo& ssl_info, 276 const net::SSLInfo& ssl_info,
310 bool fatal) { 277 bool fatal) {
311 ResourceRequestInfoImpl* info = GetRequestInfo(); 278 ResourceRequestInfoImpl* info = GetRequestInfo();
312 279
313 int render_process_id; 280 int render_process_id;
314 int render_view_id; 281 int render_view_id;
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
653 // we resume. 620 // we resume.
654 deferred_stage_ = DEFERRED_FINISH; 621 deferred_stage_ = DEFERRED_FINISH;
655 } 622 }
656 } 623 }
657 624
658 void ResourceLoader::CallDidFinishLoading() { 625 void ResourceLoader::CallDidFinishLoading() {
659 delegate_->DidFinishLoading(this); 626 delegate_->DidFinishLoading(this);
660 } 627 }
661 628
662 } // namespace content 629 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698