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 "chrome/browser/ssl/ssl_blocking_page.h" | 5 #include "chrome/browser/ssl/ssl_blocking_page.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
(...skipping 13 matching lines...) Expand all Loading... |
24 #include "chrome/common/pref_names.h" | 24 #include "chrome/common/pref_names.h" |
25 #include "components/prefs/pref_service.h" | 25 #include "components/prefs/pref_service.h" |
26 #include "components/security_interstitials/core/controller_client.h" | 26 #include "components/security_interstitials/core/controller_client.h" |
27 #include "components/security_interstitials/core/metrics_helper.h" | 27 #include "components/security_interstitials/core/metrics_helper.h" |
28 #include "components/security_interstitials/core/ssl_error_ui.h" | 28 #include "components/security_interstitials/core/ssl_error_ui.h" |
29 #include "content/public/browser/cert_store.h" | 29 #include "content/public/browser/cert_store.h" |
30 #include "content/public/browser/interstitial_page.h" | 30 #include "content/public/browser/interstitial_page.h" |
31 #include "content/public/browser/interstitial_page_delegate.h" | 31 #include "content/public/browser/interstitial_page_delegate.h" |
32 #include "content/public/browser/navigation_entry.h" | 32 #include "content/public/browser/navigation_entry.h" |
33 #include "content/public/browser/render_process_host.h" | 33 #include "content/public/browser/render_process_host.h" |
34 #include "content/public/browser/signed_certificate_timestamp_store.h" | |
35 #include "content/public/browser/web_contents.h" | 34 #include "content/public/browser/web_contents.h" |
36 #include "content/public/common/renderer_preferences.h" | 35 #include "content/public/common/renderer_preferences.h" |
37 #include "content/public/common/ssl_status.h" | 36 #include "content/public/common/ssl_status.h" |
38 #include "net/base/net_errors.h" | 37 #include "net/base/net_errors.h" |
39 | 38 |
40 using base::TimeTicks; | 39 using base::TimeTicks; |
41 using content::InterstitialPage; | 40 using content::InterstitialPage; |
42 using content::InterstitialPageDelegate; | 41 using content::InterstitialPageDelegate; |
43 using content::NavigationEntry; | 42 using content::NavigationEntry; |
44 using security_interstitials::SSLErrorUI; | 43 using security_interstitials::SSLErrorUI; |
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
192 ssl_error_ui_->PopulateStringsForHTML(load_time_data); | 191 ssl_error_ui_->PopulateStringsForHTML(load_time_data); |
193 cert_report_helper_->PopulateExtendedReportingOption(load_time_data); | 192 cert_report_helper_->PopulateExtendedReportingOption(load_time_data); |
194 } | 193 } |
195 | 194 |
196 void SSLBlockingPage::OverrideEntry(NavigationEntry* entry) { | 195 void SSLBlockingPage::OverrideEntry(NavigationEntry* entry) { |
197 const int process_id = web_contents()->GetRenderProcessHost()->GetID(); | 196 const int process_id = web_contents()->GetRenderProcessHost()->GetID(); |
198 const int cert_id = content::CertStore::GetInstance()->StoreCert( | 197 const int cert_id = content::CertStore::GetInstance()->StoreCert( |
199 ssl_info_.cert.get(), process_id); | 198 ssl_info_.cert.get(), process_id); |
200 DCHECK(cert_id); | 199 DCHECK(cert_id); |
201 | 200 |
202 content::SignedCertificateTimestampStore* sct_store( | 201 entry->GetSSL() = content::SSLStatus( |
203 content::SignedCertificateTimestampStore::GetInstance()); | 202 content::SECURITY_STYLE_AUTHENTICATION_BROKEN, cert_id, ssl_info_); |
204 content::SignedCertificateTimestampIDStatusList sct_ids; | |
205 for (const auto& sct_and_status : ssl_info_.signed_certificate_timestamps) { | |
206 const int sct_id(sct_store->Store(sct_and_status.sct.get(), process_id)); | |
207 DCHECK(sct_id); | |
208 sct_ids.push_back(content::SignedCertificateTimestampIDAndStatus( | |
209 sct_id, sct_and_status.status)); | |
210 } | |
211 | |
212 entry->GetSSL() = | |
213 content::SSLStatus(content::SECURITY_STYLE_AUTHENTICATION_BROKEN, cert_id, | |
214 sct_ids, ssl_info_); | |
215 } | 203 } |
216 | 204 |
217 void SSLBlockingPage::SetSSLCertReporterForTesting( | 205 void SSLBlockingPage::SetSSLCertReporterForTesting( |
218 std::unique_ptr<SSLCertReporter> ssl_cert_reporter) { | 206 std::unique_ptr<SSLCertReporter> ssl_cert_reporter) { |
219 cert_report_helper_->SetSSLCertReporterForTesting( | 207 cert_report_helper_->SetSSLCertReporterForTesting( |
220 std::move(ssl_cert_reporter)); | 208 std::move(ssl_cert_reporter)); |
221 } | 209 } |
222 | 210 |
223 // This handles the commands sent from the interstitial JavaScript. | 211 // This handles the commands sent from the interstitial JavaScript. |
224 void SSLBlockingPage::CommandReceived(const std::string& command) { | 212 void SSLBlockingPage::CommandReceived(const std::string& command) { |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
279 | 267 |
280 // static | 268 // static |
281 bool SSLBlockingPage::IsOverridable(int options_mask, | 269 bool SSLBlockingPage::IsOverridable(int options_mask, |
282 const Profile* const profile) { | 270 const Profile* const profile) { |
283 const bool is_overridable = | 271 const bool is_overridable = |
284 (options_mask & SSLErrorUI::SOFT_OVERRIDE_ENABLED) && | 272 (options_mask & SSLErrorUI::SOFT_OVERRIDE_ENABLED) && |
285 !(options_mask & SSLErrorUI::STRICT_ENFORCEMENT) && | 273 !(options_mask & SSLErrorUI::STRICT_ENFORCEMENT) && |
286 profile->GetPrefs()->GetBoolean(prefs::kSSLErrorOverrideAllowed); | 274 profile->GetPrefs()->GetBoolean(prefs::kSSLErrorOverrideAllowed); |
287 return is_overridable; | 275 return is_overridable; |
288 } | 276 } |
OLD | NEW |