OLD | NEW |
---|---|
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/renderer_host/x509_user_cert_resource_handler.h" | 5 #include "content/browser/renderer_host/x509_user_cert_resource_handler.h" |
6 | 6 |
7 #include "base/string_util.h" | 7 #include "base/string_util.h" |
8 #include "content/browser/renderer_host/resource_request_info_impl.h" | 8 #include "content/browser/renderer_host/resource_request_info_impl.h" |
9 #include "content/public/browser/content_browser_client.h" | 9 #include "content/public/browser/content_browser_client.h" |
10 #include "content/public/common/resource_response.h" | 10 #include "content/public/common/resource_response.h" |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
94 bool X509UserCertResourceHandler::OnResponseCompleted( | 94 bool X509UserCertResourceHandler::OnResponseCompleted( |
95 int request_id, | 95 int request_id, |
96 const net::URLRequestStatus& urs, | 96 const net::URLRequestStatus& urs, |
97 const std::string& sec_info) { | 97 const std::string& sec_info) { |
98 if (urs.status() != net::URLRequestStatus::SUCCESS) | 98 if (urs.status() != net::URLRequestStatus::SUCCESS) |
99 return false; | 99 return false; |
100 | 100 |
101 AssembleResource(); | 101 AssembleResource(); |
102 scoped_refptr<net::X509Certificate> cert; | 102 scoped_refptr<net::X509Certificate> cert; |
103 if (resource_buffer_) { | 103 if (resource_buffer_) { |
104 cert = net::X509Certificate::CreateFromBytes(resource_buffer_->data(), | 104 net::CertificateList cert_list = |
105 content_length_); | 105 net::X509Certificate::CreateCertificateListFromBytes( |
106 resource_buffer_->data(), content_length_, | |
107 net::X509Certificate::FORMAT_AUTO); | |
108 if (cert_list.size()) { | |
109 net::X509Certificate::OSCertHandle cert_handle = | |
110 cert_list[0]->os_cert_handle(); | |
111 net::X509Certificate::OSCertHandles intermediate_certs; | |
112 for (size_t i = 1; i < cert_list.size(); ++i) | |
113 intermediate_certs.push_back(cert_list[i]->os_cert_handle()); | |
114 cert = net::X509Certificate::CreateFromHandle(cert_handle, | |
115 intermediate_certs); | |
Ryan Sleevi
2012/04/27 00:55:48
note: This is not an accurate interpretation of th
wtc
2012/04/27 21:16:50
You mean we cannot assume the first certificate in
Ryan Sleevi
2012/04/27 21:24:21
Correct. The behaviour of Firefox is to do a first
| |
116 } | |
106 } | 117 } |
118 // TODO(wtc): change ContentBrowserClient::AddNewCertificate() to take | |
119 // a net::CertificateList instead of a net::X509Certificate? | |
107 content::GetContentClient()->browser()->AddNewCertificate( | 120 content::GetContentClient()->browser()->AddNewCertificate( |
108 request_, cert, render_process_host_id_, render_view_id_); | 121 request_, cert, render_process_host_id_, render_view_id_); |
109 return true; | 122 return true; |
110 } | 123 } |
111 | 124 |
112 void X509UserCertResourceHandler::OnRequestClosed() { | 125 void X509UserCertResourceHandler::OnRequestClosed() { |
113 } | 126 } |
114 | 127 |
115 X509UserCertResourceHandler::~X509UserCertResourceHandler() { | 128 X509UserCertResourceHandler::~X509UserCertResourceHandler() { |
116 } | 129 } |
117 | 130 |
118 void X509UserCertResourceHandler::AssembleResource() { | 131 void X509UserCertResourceHandler::AssembleResource() { |
119 size_t assembled_bytes = 0; | 132 size_t assembled_bytes = 0; |
120 resource_buffer_ = content::AssembleData(buffer_, &assembled_bytes); | 133 resource_buffer_ = content::AssembleData(buffer_, &assembled_bytes); |
121 DCHECK_EQ(content_length_, assembled_bytes); | 134 DCHECK_EQ(content_length_, assembled_bytes); |
122 } | 135 } |
OLD | NEW |