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

Side by Side Diff: chrome/browser/ssl/ssl_blocking_page.cc

Issue 1772603002: Addition of Certificate Transparency details to Security panel of DevTools (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: removed SignedCertificateTimestampStore and SignedCertificateTimestampIDStatus(List) Created 4 years, 9 months 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
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 "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 12 matching lines...) Expand all
23 #include "chrome/common/pref_names.h" 23 #include "chrome/common/pref_names.h"
24 #include "components/prefs/pref_service.h" 24 #include "components/prefs/pref_service.h"
25 #include "components/security_interstitials/core/controller_client.h" 25 #include "components/security_interstitials/core/controller_client.h"
26 #include "components/security_interstitials/core/metrics_helper.h" 26 #include "components/security_interstitials/core/metrics_helper.h"
27 #include "components/security_interstitials/core/ssl_error_ui.h" 27 #include "components/security_interstitials/core/ssl_error_ui.h"
28 #include "content/public/browser/cert_store.h" 28 #include "content/public/browser/cert_store.h"
29 #include "content/public/browser/interstitial_page.h" 29 #include "content/public/browser/interstitial_page.h"
30 #include "content/public/browser/interstitial_page_delegate.h" 30 #include "content/public/browser/interstitial_page_delegate.h"
31 #include "content/public/browser/navigation_entry.h" 31 #include "content/public/browser/navigation_entry.h"
32 #include "content/public/browser/render_process_host.h" 32 #include "content/public/browser/render_process_host.h"
33 #include "content/public/browser/signed_certificate_timestamp_store.h"
34 #include "content/public/browser/web_contents.h" 33 #include "content/public/browser/web_contents.h"
35 #include "content/public/common/renderer_preferences.h" 34 #include "content/public/common/renderer_preferences.h"
36 #include "content/public/common/ssl_status.h" 35 #include "content/public/common/ssl_status.h"
37 #include "net/base/net_errors.h" 36 #include "net/base/net_errors.h"
38 37
39 using base::TimeTicks; 38 using base::TimeTicks;
40 using content::InterstitialPage; 39 using content::InterstitialPage;
41 using content::InterstitialPageDelegate; 40 using content::InterstitialPageDelegate;
42 using content::NavigationEntry; 41 using content::NavigationEntry;
43 using security_interstitials::SSLErrorUI; 42 using security_interstitials::SSLErrorUI;
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 ssl_error_ui_->PopulateStringsForHTML(load_time_data); 189 ssl_error_ui_->PopulateStringsForHTML(load_time_data);
191 cert_report_helper_->PopulateExtendedReportingOption(load_time_data); 190 cert_report_helper_->PopulateExtendedReportingOption(load_time_data);
192 } 191 }
193 192
194 void SSLBlockingPage::OverrideEntry(NavigationEntry* entry) { 193 void SSLBlockingPage::OverrideEntry(NavigationEntry* entry) {
195 const int process_id = web_contents()->GetRenderProcessHost()->GetID(); 194 const int process_id = web_contents()->GetRenderProcessHost()->GetID();
196 const int cert_id = content::CertStore::GetInstance()->StoreCert( 195 const int cert_id = content::CertStore::GetInstance()->StoreCert(
197 ssl_info_.cert.get(), process_id); 196 ssl_info_.cert.get(), process_id);
198 DCHECK(cert_id); 197 DCHECK(cert_id);
199 198
200 content::SignedCertificateTimestampStore* sct_store(
201 content::SignedCertificateTimestampStore::GetInstance());
202 content::SignedCertificateTimestampIDStatusList sct_ids;
203 for (const auto& sct_and_status : ssl_info_.signed_certificate_timestamps) {
204 const int sct_id(sct_store->Store(sct_and_status.sct.get(), process_id));
205 DCHECK(sct_id);
206 sct_ids.push_back(content::SignedCertificateTimestampIDAndStatus(
207 sct_id, sct_and_status.status));
208 }
209
210 entry->GetSSL() = 199 entry->GetSSL() =
211 content::SSLStatus(content::SECURITY_STYLE_AUTHENTICATION_BROKEN, cert_id, 200 content::SSLStatus(content::SECURITY_STYLE_AUTHENTICATION_BROKEN, cert_id,
212 sct_ids, ssl_info_); 201 ssl_info_);
213 } 202 }
214 203
215 void SSLBlockingPage::SetSSLCertReporterForTesting( 204 void SSLBlockingPage::SetSSLCertReporterForTesting(
216 scoped_ptr<SSLCertReporter> ssl_cert_reporter) { 205 scoped_ptr<SSLCertReporter> ssl_cert_reporter) {
217 cert_report_helper_->SetSSLCertReporterForTesting( 206 cert_report_helper_->SetSSLCertReporterForTesting(
218 std::move(ssl_cert_reporter)); 207 std::move(ssl_cert_reporter));
219 } 208 }
220 209
221 // This handles the commands sent from the interstitial JavaScript. 210 // This handles the commands sent from the interstitial JavaScript.
222 void SSLBlockingPage::CommandReceived(const std::string& command) { 211 void SSLBlockingPage::CommandReceived(const std::string& command) {
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 266
278 // static 267 // static
279 bool SSLBlockingPage::IsOverridable(int options_mask, 268 bool SSLBlockingPage::IsOverridable(int options_mask,
280 const Profile* const profile) { 269 const Profile* const profile) {
281 const bool is_overridable = 270 const bool is_overridable =
282 (options_mask & SSLErrorUI::SOFT_OVERRIDE_ENABLED) && 271 (options_mask & SSLErrorUI::SOFT_OVERRIDE_ENABLED) &&
283 !(options_mask & SSLErrorUI::STRICT_ENFORCEMENT) && 272 !(options_mask & SSLErrorUI::STRICT_ENFORCEMENT) &&
284 profile->GetPrefs()->GetBoolean(prefs::kSSLErrorOverrideAllowed); 273 profile->GetPrefs()->GetBoolean(prefs::kSSLErrorOverrideAllowed);
285 return is_overridable; 274 return is_overridable;
286 } 275 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698