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

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

Issue 935663004: Add checkbox for reporting invalid TLS/SSL cert chains (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: felt's comments Created 5 years, 10 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 "base/build_time.h" 7 #include "base/build_time.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/i18n/rtl.h" 9 #include "base/i18n/rtl.h"
10 #include "base/i18n/time_formatting.h" 10 #include "base/i18n/time_formatting.h"
11 #include "base/metrics/field_trial.h" 11 #include "base/metrics/field_trial.h"
12 #include "base/metrics/histogram.h" 12 #include "base/metrics/histogram.h"
13 #include "base/prefs/pref_service.h"
13 #include "base/process/launch.h" 14 #include "base/process/launch.h"
14 #include "base/strings/string_number_conversions.h" 15 #include "base/strings/string_number_conversions.h"
15 #include "base/strings/string_piece.h" 16 #include "base/strings/string_piece.h"
16 #include "base/strings/string_util.h" 17 #include "base/strings/string_util.h"
17 #include "base/strings/stringprintf.h" 18 #include "base/strings/stringprintf.h"
18 #include "base/strings/utf_string_conversions.h" 19 #include "base/strings/utf_string_conversions.h"
19 #include "base/time/time.h" 20 #include "base/time/time.h"
20 #include "base/values.h" 21 #include "base/values.h"
21 #include "chrome/browser/browser_process.h" 22 #include "chrome/browser/browser_process.h"
22 #include "chrome/browser/chrome_notification_types.h" 23 #include "chrome/browser/chrome_notification_types.h"
23 #include "chrome/browser/profiles/profile.h" 24 #include "chrome/browser/profiles/profile.h"
24 #include "chrome/browser/renderer_preferences_util.h" 25 #include "chrome/browser/renderer_preferences_util.h"
25 #include "chrome/browser/ssl/ssl_error_classification.h" 26 #include "chrome/browser/ssl/ssl_error_classification.h"
26 #include "chrome/browser/ssl/ssl_error_info.h" 27 #include "chrome/browser/ssl/ssl_error_info.h"
27 #include "chrome/common/chrome_switches.h" 28 #include "chrome/common/chrome_switches.h"
29 #include "chrome/common/pref_names.h"
28 #include "chrome/grit/chromium_strings.h" 30 #include "chrome/grit/chromium_strings.h"
29 #include "chrome/grit/generated_resources.h" 31 #include "chrome/grit/generated_resources.h"
30 #include "components/google/core/browser/google_util.h" 32 #include "components/google/core/browser/google_util.h"
31 #include "content/public/browser/cert_store.h" 33 #include "content/public/browser/cert_store.h"
32 #include "content/public/browser/interstitial_page.h" 34 #include "content/public/browser/interstitial_page.h"
33 #include "content/public/browser/navigation_controller.h" 35 #include "content/public/browser/navigation_controller.h"
34 #include "content/public/browser/navigation_entry.h" 36 #include "content/public/browser/navigation_entry.h"
35 #include "content/public/browser/notification_service.h" 37 #include "content/public/browser/notification_service.h"
36 #include "content/public/browser/notification_types.h" 38 #include "content/public/browser/notification_types.h"
37 #include "content/public/browser/render_process_host.h" 39 #include "content/public/browser/render_process_host.h"
38 #include "content/public/browser/render_view_host.h" 40 #include "content/public/browser/render_view_host.h"
39 #include "content/public/browser/web_contents.h" 41 #include "content/public/browser/web_contents.h"
40 #include "content/public/common/renderer_preferences.h" 42 #include "content/public/common/renderer_preferences.h"
41 #include "content/public/common/ssl_status.h" 43 #include "content/public/common/ssl_status.h"
42 #include "grit/browser_resources.h" 44 #include "grit/browser_resources.h"
43 #include "net/base/hash_value.h" 45 #include "net/base/hash_value.h"
44 #include "net/base/net_errors.h" 46 #include "net/base/net_errors.h"
45 #include "net/base/net_util.h" 47 #include "net/base/net_util.h"
48 #include "net/url_request/fraudulent_certificate_reporter.h"
49 #include "net/url_request/url_request_context.h"
50 #include "net/url_request/url_request_context_getter.h"
46 #include "ui/base/l10n/l10n_util.h" 51 #include "ui/base/l10n/l10n_util.h"
47 52
48 #if defined(OS_WIN) 53 #if defined(OS_WIN)
49 #include "base/base_paths_win.h" 54 #include "base/base_paths_win.h"
50 #include "base/path_service.h" 55 #include "base/path_service.h"
51 #include "base/strings/string16.h" 56 #include "base/strings/string16.h"
52 #include "base/win/windows_version.h" 57 #include "base/win/windows_version.h"
53 #endif 58 #endif
54 59
55 #if defined(OS_ANDROID) 60 #if defined(OS_ANDROID)
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 &SSLBlockingPage::kTypeForTesting; 221 &SSLBlockingPage::kTypeForTesting;
217 222
218 // Note that we always create a navigation entry with SSL errors. 223 // Note that we always create a navigation entry with SSL errors.
219 // No error happening loading a sub-resource triggers an interstitial so far. 224 // No error happening loading a sub-resource triggers an interstitial so far.
220 SSLBlockingPage::SSLBlockingPage(content::WebContents* web_contents, 225 SSLBlockingPage::SSLBlockingPage(content::WebContents* web_contents,
221 int cert_error, 226 int cert_error,
222 const net::SSLInfo& ssl_info, 227 const net::SSLInfo& ssl_info,
223 const GURL& request_url, 228 const GURL& request_url,
224 int options_mask, 229 int options_mask,
225 const base::Callback<void(bool)>& callback) 230 const base::Callback<void(bool)>& callback)
226 : SecurityInterstitialPage(web_contents, request_url), 231 : SecurityInterstitialPageWithExtendedReporting(web_contents, request_url),
227 callback_(callback), 232 callback_(callback),
228 cert_error_(cert_error), 233 cert_error_(cert_error),
229 ssl_info_(ssl_info), 234 ssl_info_(ssl_info),
230 overridable_(IsOptionsOverridable(options_mask)), 235 overridable_(IsOptionsOverridable(options_mask)),
231 danger_overridable_(true), 236 danger_overridable_(true),
232 strict_enforcement_((options_mask & STRICT_ENFORCEMENT) != 0), 237 strict_enforcement_((options_mask & STRICT_ENFORCEMENT) != 0),
233 expired_but_previously_allowed_( 238 expired_but_previously_allowed_(
234 (options_mask & EXPIRED_BUT_PREVIOUSLY_ALLOWED) != 0) { 239 (options_mask & EXPIRED_BUT_PREVIOUSLY_ALLOWED) != 0) {
235 interstitial_reason_ = 240 interstitial_reason_ =
236 IsErrorDueToBadClock(base::Time::NowFromSystemTime(), cert_error_) ? 241 IsErrorDueToBadClock(base::Time::NowFromSystemTime(), cert_error_) ?
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
423 load_time_data->SetString( 428 load_time_data->SetString(
424 "issuer", ssl_info_.cert->issuer().GetDisplayName()); 429 "issuer", ssl_info_.cert->issuer().GetDisplayName());
425 load_time_data->SetString( 430 load_time_data->SetString(
426 "expirationDate", 431 "expirationDate",
427 base::TimeFormatShortDate(ssl_info_.cert->valid_expiry())); 432 base::TimeFormatShortDate(ssl_info_.cert->valid_expiry()));
428 load_time_data->SetString( 433 load_time_data->SetString(
429 "currentDate", base::TimeFormatShortDate(now)); 434 "currentDate", base::TimeFormatShortDate(now));
430 std::vector<std::string> encoded_chain; 435 std::vector<std::string> encoded_chain;
431 ssl_info_.cert->GetPEMEncodedChain(&encoded_chain); 436 ssl_info_.cert->GetPEMEncodedChain(&encoded_chain);
432 load_time_data->SetString("pem", JoinString(encoded_chain, std::string())); 437 load_time_data->SetString("pem", JoinString(encoded_chain, std::string()));
438
439 PopulateExtendedReportingOption(load_time_data);
433 } 440 }
434 441
435 void SSLBlockingPage::OverrideEntry(NavigationEntry* entry) { 442 void SSLBlockingPage::OverrideEntry(NavigationEntry* entry) {
436 int cert_id = content::CertStore::GetInstance()->StoreCert( 443 int cert_id = content::CertStore::GetInstance()->StoreCert(
437 ssl_info_.cert.get(), web_contents()->GetRenderProcessHost()->GetID()); 444 ssl_info_.cert.get(), web_contents()->GetRenderProcessHost()->GetID());
438 DCHECK(cert_id); 445 DCHECK(cert_id);
439 446
440 entry->GetSSL().security_style = 447 entry->GetSSL().security_style =
441 content::SECURITY_STYLE_AUTHENTICATION_BROKEN; 448 content::SECURITY_STYLE_AUTHENTICATION_BROKEN;
442 entry->GetSSL().cert_id = cert_id; 449 entry->GetSSL().cert_id = cert_id;
(...skipping 12 matching lines...) Expand all
455 case CMD_DONT_PROCEED: { 462 case CMD_DONT_PROCEED: {
456 interstitial_page()->DontProceed(); 463 interstitial_page()->DontProceed();
457 break; 464 break;
458 } 465 }
459 case CMD_PROCEED: { 466 case CMD_PROCEED: {
460 if (danger_overridable_) { 467 if (danger_overridable_) {
461 interstitial_page()->Proceed(); 468 interstitial_page()->Proceed();
462 } 469 }
463 break; 470 break;
464 } 471 }
472 case CMD_DO_REPORT: {
473 SetReportingPreference(true);
474 break;
475 }
476 case CMD_DONT_REPORT: {
477 SetReportingPreference(false);
478 break;
479 }
465 case CMD_MORE: { 480 case CMD_MORE: {
466 metrics_helper_->RecordUserInteraction( 481 metrics_helper_->RecordUserInteraction(
467 SecurityInterstitialMetricsHelper::SHOW_ADVANCED); 482 SecurityInterstitialMetricsHelper::SHOW_ADVANCED);
468 break; 483 break;
469 } 484 }
470 case CMD_RELOAD: { 485 case CMD_RELOAD: {
471 metrics_helper_->RecordUserInteraction( 486 metrics_helper_->RecordUserInteraction(
472 SecurityInterstitialMetricsHelper::RELOAD); 487 SecurityInterstitialMetricsHelper::RELOAD);
473 // The interstitial can't refresh itself. 488 // The interstitial can't refresh itself.
474 web_contents()->GetController().Reload(true); 489 web_contents()->GetController().Reload(true);
(...skipping 24 matching lines...) Expand all
499 content::RendererPreferences* prefs) { 514 content::RendererPreferences* prefs) {
500 Profile* profile = Profile::FromBrowserContext( 515 Profile* profile = Profile::FromBrowserContext(
501 web_contents()->GetBrowserContext()); 516 web_contents()->GetBrowserContext());
502 renderer_preferences_util::UpdateFromSystemSettings( 517 renderer_preferences_util::UpdateFromSystemSettings(
503 prefs, profile, web_contents()); 518 prefs, profile, web_contents());
504 } 519 }
505 520
506 void SSLBlockingPage::OnProceed() { 521 void SSLBlockingPage::OnProceed() {
507 metrics_helper_->RecordUserDecision( 522 metrics_helper_->RecordUserDecision(
508 SecurityInterstitialMetricsHelper::PROCEED); 523 SecurityInterstitialMetricsHelper::PROCEED);
524
525 // Finish collection information about invalid certificates, if the
526 // user opted in to.
527 FinishCertCollection();
528
509 RecordSSLExpirationPageEventState( 529 RecordSSLExpirationPageEventState(
510 expired_but_previously_allowed_, true, overridable_); 530 expired_but_previously_allowed_, true, overridable_);
511 // Accepting the certificate resumes the loading of the page. 531 // Accepting the certificate resumes the loading of the page.
512 NotifyAllowCertificate(); 532 NotifyAllowCertificate();
513 } 533 }
514 534
515 void SSLBlockingPage::OnDontProceed() { 535 void SSLBlockingPage::OnDontProceed() {
516 metrics_helper_->RecordUserDecision( 536 metrics_helper_->RecordUserDecision(
517 SecurityInterstitialMetricsHelper::DONT_PROCEED); 537 SecurityInterstitialMetricsHelper::DONT_PROCEED);
538
539 // Finish collection information about invalid certificates, if the
540 // user opted in to.
541 FinishCertCollection();
542
518 RecordSSLExpirationPageEventState( 543 RecordSSLExpirationPageEventState(
519 expired_but_previously_allowed_, false, overridable_); 544 expired_but_previously_allowed_, false, overridable_);
520 NotifyDenyCertificate(); 545 NotifyDenyCertificate();
521 } 546 }
522 547
548 void SSLBlockingPage::FinishCertCollection() {
549 const bool enabled =
550 IsPrefEnabled(prefs::kSafeBrowsingExtendedReportingEnabled);
551 UMA_HISTOGRAM_BOOLEAN("SB2.ExtendedReportingIsEnabled", enabled);
552
553 if (enabled) {
554 net::URLRequestContext* request_context = web_contents()
555 ->GetBrowserContext()
556 ->GetRequestContext()
557 ->GetURLRequestContext();
558 net::FraudulentCertificateReporter* reporter =
559 request_context->fraudulent_certificate_reporter();
560 reporter->SendInvalidChainReport(request_url().host(), ssl_info_);
561 }
562 }
563
523 void SSLBlockingPage::NotifyDenyCertificate() { 564 void SSLBlockingPage::NotifyDenyCertificate() {
524 // It's possible that callback_ may not exist if the user clicks "Proceed" 565 // It's possible that callback_ may not exist if the user clicks "Proceed"
525 // followed by pressing the back button before the interstitial is hidden. 566 // followed by pressing the back button before the interstitial is hidden.
526 // In that case the certificate will still be treated as allowed. 567 // In that case the certificate will still be treated as allowed.
527 if (callback_.is_null()) 568 if (callback_.is_null())
528 return; 569 return;
529 570
530 callback_.Run(false); 571 callback_.Run(false);
531 callback_.Reset(); 572 callback_.Reset();
532 } 573 }
(...skipping 27 matching lines...) Expand all
560 event_name.append(kEventNotOverridable); 601 event_name.append(kEventNotOverridable);
561 event_name.append(net::ErrorToString(cert_error_)); 602 event_name.append(net::ErrorToString(cert_error_));
562 return event_name; 603 return event_name;
563 } 604 }
564 605
565 // static 606 // static
566 bool SSLBlockingPage::IsOptionsOverridable(int options_mask) { 607 bool SSLBlockingPage::IsOptionsOverridable(int options_mask) {
567 return (options_mask & SSLBlockingPage::OVERRIDABLE) && 608 return (options_mask & SSLBlockingPage::OVERRIDABLE) &&
568 !(options_mask & SSLBlockingPage::STRICT_ENFORCEMENT); 609 !(options_mask & SSLBlockingPage::STRICT_ENFORCEMENT);
569 } 610 }
611
612 void SSLBlockingPage::PopulateExtendedReportingOption(
613 base::DictionaryValue* load_time_data) {
felt 2015/02/19 00:32:32 Should we exclude Lucas's clock interstitials, bot
estark 2015/02/19 02:32:09 Done.
estark 2015/02/19 02:37:30 On second thought, I do think at some point it cou
felt 2015/02/20 19:20:34 That's an interesting point, I hadn't thought of t
estark 2015/02/21 06:53:04 Hmm, so I can think of two or three ways that we c
felt 2015/02/24 01:57:52 My suggestion to proceed here: include the clock i
estark 2015/02/24 18:47:08 Done -- cc'ed you on the email to ainslie.
614 // Only show the checkbox if not off-the-record and if the
615 // command-line option is set.
616 const bool show = !web_contents()->GetBrowserContext()->IsOffTheRecord() &&
617 base::CommandLine::ForCurrentProcess()->HasSwitch(
618 switches::kEnableInvalidCertCollection);
619
620 load_time_data->SetBoolean(interstitials::kDisplayCheckBox, show);
621 if (!show)
622 return;
623
624 load_time_data->SetBoolean(
625 interstitials::kBoxChecked,
626 IsPrefEnabled(prefs::kSafeBrowsingExtendedReportingEnabled));
627
628 const std::string privacy_link = base::StringPrintf(
629 interstitials::kPrivacyLinkHtml,
630 l10n_util::GetStringUTF8(IDS_SAFE_BROWSING_PRIVACY_POLICY_PAGE).c_str());
631
632 load_time_data->SetString(
633 "optInLink",
634 l10n_util::GetStringFUTF16(IDS_SAFE_BROWSING_MALWARE_REPORTING_AGREE,
635 base::UTF8ToUTF16(privacy_link)));
636 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698