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

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

Issue 1035023002: Adding the Finch code for the certificate error reporter experiment (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix logic bug and add test for invalid Finch param value Created 5 years, 8 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/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/build_time.h" 9 #include "base/build_time.h"
10 #include "base/callback_helpers.h" 10 #include "base/callback_helpers.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/i18n/rtl.h" 12 #include "base/i18n/rtl.h"
13 #include "base/i18n/time_formatting.h" 13 #include "base/i18n/time_formatting.h"
14 #include "base/metrics/field_trial.h" 14 #include "base/metrics/field_trial.h"
15 #include "base/metrics/histogram.h" 15 #include "base/metrics/histogram.h"
16 #include "base/prefs/pref_service.h" 16 #include "base/prefs/pref_service.h"
17 #include "base/process/launch.h" 17 #include "base/process/launch.h"
18 #include "base/rand_util.h"
18 #include "base/strings/string_number_conversions.h" 19 #include "base/strings/string_number_conversions.h"
19 #include "base/strings/string_piece.h" 20 #include "base/strings/string_piece.h"
20 #include "base/strings/string_util.h" 21 #include "base/strings/string_util.h"
21 #include "base/strings/stringprintf.h" 22 #include "base/strings/stringprintf.h"
22 #include "base/strings/utf_string_conversions.h" 23 #include "base/strings/utf_string_conversions.h"
23 #include "base/time/time.h" 24 #include "base/time/time.h"
24 #include "base/values.h" 25 #include "base/values.h"
25 #include "chrome/browser/browser_process.h" 26 #include "chrome/browser/browser_process.h"
26 #include "chrome/browser/chrome_notification_types.h" 27 #include "chrome/browser/chrome_notification_types.h"
27 #include "chrome/browser/interstitials/security_interstitial_metrics_helper.h" 28 #include "chrome/browser/interstitials/security_interstitial_metrics_helper.h"
28 #include "chrome/browser/profiles/profile.h" 29 #include "chrome/browser/profiles/profile.h"
29 #include "chrome/browser/renderer_preferences_util.h" 30 #include "chrome/browser/renderer_preferences_util.h"
30 #include "chrome/browser/safe_browsing/ui_manager.h" 31 #include "chrome/browser/safe_browsing/ui_manager.h"
31 #include "chrome/browser/ssl/ssl_error_classification.h" 32 #include "chrome/browser/ssl/ssl_error_classification.h"
32 #include "chrome/browser/ssl/ssl_error_info.h" 33 #include "chrome/browser/ssl/ssl_error_info.h"
33 #include "chrome/common/chrome_switches.h" 34 #include "chrome/common/chrome_switches.h"
34 #include "chrome/common/pref_names.h" 35 #include "chrome/common/pref_names.h"
35 #include "chrome/grit/chromium_strings.h" 36 #include "chrome/grit/chromium_strings.h"
36 #include "chrome/grit/generated_resources.h" 37 #include "chrome/grit/generated_resources.h"
37 #include "components/google/core/browser/google_util.h" 38 #include "components/google/core/browser/google_util.h"
39 #include "components/variations/variations_associated_data.h"
38 #include "content/public/browser/browser_thread.h" 40 #include "content/public/browser/browser_thread.h"
39 #include "content/public/browser/cert_store.h" 41 #include "content/public/browser/cert_store.h"
40 #include "content/public/browser/interstitial_page.h" 42 #include "content/public/browser/interstitial_page.h"
41 #include "content/public/browser/interstitial_page_delegate.h" 43 #include "content/public/browser/interstitial_page_delegate.h"
42 #include "content/public/browser/navigation_controller.h" 44 #include "content/public/browser/navigation_controller.h"
43 #include "content/public/browser/navigation_entry.h" 45 #include "content/public/browser/navigation_entry.h"
44 #include "content/public/browser/notification_service.h" 46 #include "content/public/browser/notification_service.h"
45 #include "content/public/browser/notification_types.h" 47 #include "content/public/browser/notification_types.h"
46 #include "content/public/browser/render_process_host.h" 48 #include "content/public/browser/render_process_host.h"
47 #include "content/public/browser/render_view_host.h" 49 #include "content/public/browser/render_view_host.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 EXPIRED_AND_PROCEED, 95 EXPIRED_AND_PROCEED,
94 EXPIRED_AND_DO_NOT_PROCEED, 96 EXPIRED_AND_DO_NOT_PROCEED,
95 NOT_EXPIRED_AND_PROCEED, 97 NOT_EXPIRED_AND_PROCEED,
96 NOT_EXPIRED_AND_DO_NOT_PROCEED, 98 NOT_EXPIRED_AND_DO_NOT_PROCEED,
97 END_OF_SSL_EXPIRATION_AND_DECISION, 99 END_OF_SSL_EXPIRATION_AND_DECISION,
98 }; 100 };
99 101
100 // Rappor prefix 102 // Rappor prefix
101 const char kSSLRapporPrefix[] = "ssl"; 103 const char kSSLRapporPrefix[] = "ssl";
102 104
105 // Check whether to show the certificate reporter checkbox
106 bool ShouldShowCertificateReporterCheckbox(bool in_incognito) {
107 // Check Finch parameters
108 return base::FieldTrialList::FindFullName("ReportCertificateErrors")
109 .compare("ShowAndPossiblySend") == 0 &&
110 !in_incognito;
111 }
112
113 // Check whether to report certificate verification errors to Google
114 bool ShouldReportCertificateErrors(bool in_incognito) {
115 DCHECK(ShouldShowCertificateReporterCheckbox(in_incognito));
116 // Check Finch parameters
117 const std::string param = variations::GetVariationParamValue(
118 "ReportCertificateErrors", "possibly_send");
119 if (param.compare("") != 0) {
120 double possiblySend;
121 if (base::StringToDouble(param, &possiblySend))
122 if (possiblySend >= 0.0 && possiblySend <= 1.0)
123 return base::RandDouble() <= possiblySend;
124 }
125 return false;
126 }
127
103 void RecordSSLExpirationPageEventState(bool expired_but_previously_allowed, 128 void RecordSSLExpirationPageEventState(bool expired_but_previously_allowed,
104 bool proceed, 129 bool proceed,
105 bool overridable) { 130 bool overridable) {
106 SSLExpirationAndDecision event; 131 SSLExpirationAndDecision event;
107 if (expired_but_previously_allowed && proceed) 132 if (expired_but_previously_allowed && proceed)
108 event = EXPIRED_AND_PROCEED; 133 event = EXPIRED_AND_PROCEED;
109 else if (expired_but_previously_allowed && !proceed) 134 else if (expired_but_previously_allowed && !proceed)
110 event = EXPIRED_AND_DO_NOT_PROCEED; 135 event = EXPIRED_AND_DO_NOT_PROCEED;
111 else if (!expired_but_previously_allowed && proceed) 136 else if (!expired_but_previously_allowed && proceed)
112 event = NOT_EXPIRED_AND_PROCEED; 137 event = NOT_EXPIRED_AND_PROCEED;
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
450 load_time_data->SetString( 475 load_time_data->SetString(
451 "pem", JoinString(encoded_chain, std::string())); 476 "pem", JoinString(encoded_chain, std::string()));
452 477
453 PopulateExtendedReportingOption(load_time_data); 478 PopulateExtendedReportingOption(load_time_data);
454 } 479 }
455 480
456 void SSLBlockingPage::PopulateExtendedReportingOption( 481 void SSLBlockingPage::PopulateExtendedReportingOption(
457 base::DictionaryValue* load_time_data) { 482 base::DictionaryValue* load_time_data) {
458 // Only show the checkbox if not off-the-record and if the 483 // Only show the checkbox if not off-the-record and if the
459 // command-line option is set. 484 // command-line option is set.
460 const bool show = !web_contents()->GetBrowserContext()->IsOffTheRecord() && 485 const bool show = ShouldShowCertificateReporterCheckbox(
461 base::CommandLine::ForCurrentProcess()->HasSwitch( 486 web_contents()->GetBrowserContext()->IsOffTheRecord());
462 switches::kEnableInvalidCertCollection);
463 487
464 load_time_data->SetBoolean(interstitials::kDisplayCheckBox, show); 488 load_time_data->SetBoolean(interstitials::kDisplayCheckBox, show);
465 if (!show) 489 if (!show)
466 return; 490 return;
467 491
468 load_time_data->SetBoolean( 492 load_time_data->SetBoolean(
469 interstitials::kBoxChecked, 493 interstitials::kBoxChecked,
470 IsPrefEnabled(prefs::kSafeBrowsingExtendedReportingEnabled)); 494 IsPrefEnabled(prefs::kSafeBrowsingExtendedReportingEnabled));
471 495
472 const std::string privacy_link = base::StringPrintf( 496 const std::string privacy_link = base::StringPrintf(
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
638 else 662 else
639 event_name.append(kEventNotOverridable); 663 event_name.append(kEventNotOverridable);
640 event_name.append(net::ErrorToString(cert_error_)); 664 event_name.append(net::ErrorToString(cert_error_));
641 return event_name; 665 return event_name;
642 } 666 }
643 667
644 void SSLBlockingPage::FinishCertCollection() { 668 void SSLBlockingPage::FinishCertCollection() {
645 base::ScopedClosureRunner scoped_callback( 669 base::ScopedClosureRunner scoped_callback(
646 certificate_report_callback_for_testing_); 670 certificate_report_callback_for_testing_);
647 671
648 if (!base::CommandLine::ForCurrentProcess()->HasSwitch( 672 if (!ShouldShowCertificateReporterCheckbox(
649 switches::kEnableInvalidCertCollection) || 673 web_contents()->GetBrowserContext()->IsOffTheRecord()))
estark 2015/04/02 20:01:32 Sorry, one more nit here, I think the body should
fahl 2015/04/02 21:38:04 Done.
650 web_contents()->GetBrowserContext()->IsOffTheRecord()) {
651 return; 674 return;
652 }
653 675
654 const bool enabled = 676 const bool enabled =
655 IsPrefEnabled(prefs::kSafeBrowsingExtendedReportingEnabled); 677 IsPrefEnabled(prefs::kSafeBrowsingExtendedReportingEnabled);
656 678
657 if (!enabled) 679 if (!enabled)
658 return; 680 return;
659 681
660 metrics_helper()->RecordUserInteraction( 682 metrics_helper()->RecordUserInteraction(
661 SecurityInterstitialMetricsHelper::EXTENDED_REPORTING_IS_ENABLED); 683 SecurityInterstitialMetricsHelper::EXTENDED_REPORTING_IS_ENABLED);
662 684
663 if (certificate_report_callback_for_testing_.is_null()) 685 if (ShouldReportCertificateErrors(
664 scoped_callback.Reset(base::Bind(&base::DoNothing)); 686 web_contents()->GetBrowserContext()->IsOffTheRecord())) {
665 687 if (certificate_report_callback_for_testing_.is_null())
666 safe_browsing_ui_manager_->ReportInvalidCertificateChain( 688 scoped_callback.Reset(base::Bind(&base::DoNothing));
667 request_url().host(), ssl_info_, scoped_callback.Release()); 689 safe_browsing_ui_manager_->ReportInvalidCertificateChain(
690 request_url().host(), ssl_info_, scoped_callback.Release());
691 }
668 } 692 }
669 693
670 // static 694 // static
671 bool SSLBlockingPage::IsOptionsOverridable(int options_mask) { 695 bool SSLBlockingPage::IsOptionsOverridable(int options_mask) {
672 return (options_mask & SSLBlockingPage::OVERRIDABLE) && 696 return (options_mask & SSLBlockingPage::OVERRIDABLE) &&
673 !(options_mask & SSLBlockingPage::STRICT_ENFORCEMENT); 697 !(options_mask & SSLBlockingPage::STRICT_ENFORCEMENT);
674 } 698 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698