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

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: rsleevi's comments: fix threading bug and add comments Created 5 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 "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"
33 #include "content/public/browser/browser_thread.h"
31 #include "content/public/browser/cert_store.h" 34 #include "content/public/browser/cert_store.h"
32 #include "content/public/browser/interstitial_page.h" 35 #include "content/public/browser/interstitial_page.h"
33 #include "content/public/browser/navigation_controller.h" 36 #include "content/public/browser/navigation_controller.h"
34 #include "content/public/browser/navigation_entry.h" 37 #include "content/public/browser/navigation_entry.h"
35 #include "content/public/browser/notification_service.h" 38 #include "content/public/browser/notification_service.h"
36 #include "content/public/browser/notification_types.h" 39 #include "content/public/browser/notification_types.h"
37 #include "content/public/browser/render_process_host.h" 40 #include "content/public/browser/render_process_host.h"
38 #include "content/public/browser/render_view_host.h" 41 #include "content/public/browser/render_view_host.h"
39 #include "content/public/browser/web_contents.h" 42 #include "content/public/browser/web_contents.h"
40 #include "content/public/common/renderer_preferences.h" 43 #include "content/public/common/renderer_preferences.h"
41 #include "content/public/common/ssl_status.h" 44 #include "content/public/common/ssl_status.h"
42 #include "grit/browser_resources.h" 45 #include "grit/browser_resources.h"
43 #include "net/base/hash_value.h" 46 #include "net/base/hash_value.h"
44 #include "net/base/net_errors.h" 47 #include "net/base/net_errors.h"
45 #include "net/base/net_util.h" 48 #include "net/base/net_util.h"
49 #include "net/url_request/fraudulent_certificate_reporter.h"
50 #include "net/url_request/url_request_context.h"
51 #include "net/url_request/url_request_context_getter.h"
46 #include "ui/base/l10n/l10n_util.h" 52 #include "ui/base/l10n/l10n_util.h"
47 53
48 #if defined(OS_WIN) 54 #if defined(OS_WIN)
49 #include "base/base_paths_win.h" 55 #include "base/base_paths_win.h"
50 #include "base/path_service.h" 56 #include "base/path_service.h"
51 #include "base/strings/string16.h" 57 #include "base/strings/string16.h"
52 #include "base/win/windows_version.h" 58 #include "base/win/windows_version.h"
53 #endif 59 #endif
54 60
55 #if defined(OS_ANDROID) 61 #if defined(OS_ANDROID)
56 #include "chrome/browser/android/intent_helper.h" 62 #include "chrome/browser/android/intent_helper.h"
57 #endif 63 #endif
58 64
59 #if defined(OS_CHROMEOS) 65 #if defined(OS_CHROMEOS)
60 #include "chrome/browser/profiles/profile_manager.h" 66 #include "chrome/browser/profiles/profile_manager.h"
61 #include "chrome/browser/ui/chrome_pages.h" 67 #include "chrome/browser/ui/chrome_pages.h"
62 #include "chrome/common/url_constants.h" 68 #include "chrome/common/url_constants.h"
63 #endif 69 #endif
64 70
65 using base::ASCIIToUTF16; 71 using base::ASCIIToUTF16;
66 using base::TimeTicks; 72 using base::TimeTicks;
73 using content::BrowserThread;
67 using content::InterstitialPage; 74 using content::InterstitialPage;
68 using content::NavigationController; 75 using content::NavigationController;
69 using content::NavigationEntry; 76 using content::NavigationEntry;
70 77
71 namespace { 78 namespace {
72 79
73 // URL for help page. 80 // URL for help page.
74 const char kHelpURL[] = "https://support.google.com/chrome/answer/4454607"; 81 const char kHelpURL[] = "https://support.google.com/chrome/answer/4454607";
75 82
76 // Constants for the Experience Sampling instrumentation. 83 // Constants for the Experience Sampling instrumentation.
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
423 load_time_data->SetString( 430 load_time_data->SetString(
424 "issuer", ssl_info_.cert->issuer().GetDisplayName()); 431 "issuer", ssl_info_.cert->issuer().GetDisplayName());
425 load_time_data->SetString( 432 load_time_data->SetString(
426 "expirationDate", 433 "expirationDate",
427 base::TimeFormatShortDate(ssl_info_.cert->valid_expiry())); 434 base::TimeFormatShortDate(ssl_info_.cert->valid_expiry()));
428 load_time_data->SetString( 435 load_time_data->SetString(
429 "currentDate", base::TimeFormatShortDate(now)); 436 "currentDate", base::TimeFormatShortDate(now));
430 std::vector<std::string> encoded_chain; 437 std::vector<std::string> encoded_chain;
431 ssl_info_.cert->GetPEMEncodedChain(&encoded_chain); 438 ssl_info_.cert->GetPEMEncodedChain(&encoded_chain);
432 load_time_data->SetString("pem", JoinString(encoded_chain, std::string())); 439 load_time_data->SetString("pem", JoinString(encoded_chain, std::string()));
440
441 PopulateExtendedReportingOption(load_time_data);
433 } 442 }
434 443
435 void SSLBlockingPage::OverrideEntry(NavigationEntry* entry) { 444 void SSLBlockingPage::OverrideEntry(NavigationEntry* entry) {
436 int cert_id = content::CertStore::GetInstance()->StoreCert( 445 int cert_id = content::CertStore::GetInstance()->StoreCert(
437 ssl_info_.cert.get(), web_contents()->GetRenderProcessHost()->GetID()); 446 ssl_info_.cert.get(), web_contents()->GetRenderProcessHost()->GetID());
438 DCHECK(cert_id); 447 DCHECK(cert_id);
439 448
440 entry->GetSSL().security_style = 449 entry->GetSSL().security_style =
441 content::SECURITY_STYLE_AUTHENTICATION_BROKEN; 450 content::SECURITY_STYLE_AUTHENTICATION_BROKEN;
442 entry->GetSSL().cert_id = cert_id; 451 entry->GetSSL().cert_id = cert_id;
(...skipping 12 matching lines...) Expand all
455 case CMD_DONT_PROCEED: { 464 case CMD_DONT_PROCEED: {
456 interstitial_page()->DontProceed(); 465 interstitial_page()->DontProceed();
457 break; 466 break;
458 } 467 }
459 case CMD_PROCEED: { 468 case CMD_PROCEED: {
460 if (danger_overridable_) { 469 if (danger_overridable_) {
461 interstitial_page()->Proceed(); 470 interstitial_page()->Proceed();
462 } 471 }
463 break; 472 break;
464 } 473 }
474 case CMD_DO_REPORT: {
475 SetReportingPreference(true);
476 break;
477 }
478 case CMD_DONT_REPORT: {
479 SetReportingPreference(false);
480 break;
481 }
465 case CMD_MORE: { 482 case CMD_MORE: {
466 metrics_helper_->RecordUserInteraction( 483 metrics_helper_->RecordUserInteraction(
467 SecurityInterstitialMetricsHelper::SHOW_ADVANCED); 484 SecurityInterstitialMetricsHelper::SHOW_ADVANCED);
468 break; 485 break;
469 } 486 }
470 case CMD_RELOAD: { 487 case CMD_RELOAD: {
471 metrics_helper_->RecordUserInteraction( 488 metrics_helper_->RecordUserInteraction(
472 SecurityInterstitialMetricsHelper::RELOAD); 489 SecurityInterstitialMetricsHelper::RELOAD);
473 // The interstitial can't refresh itself. 490 // The interstitial can't refresh itself.
474 web_contents()->GetController().Reload(true); 491 web_contents()->GetController().Reload(true);
(...skipping 24 matching lines...) Expand all
499 content::RendererPreferences* prefs) { 516 content::RendererPreferences* prefs) {
500 Profile* profile = Profile::FromBrowserContext( 517 Profile* profile = Profile::FromBrowserContext(
501 web_contents()->GetBrowserContext()); 518 web_contents()->GetBrowserContext());
502 renderer_preferences_util::UpdateFromSystemSettings( 519 renderer_preferences_util::UpdateFromSystemSettings(
503 prefs, profile, web_contents()); 520 prefs, profile, web_contents());
504 } 521 }
505 522
506 void SSLBlockingPage::OnProceed() { 523 void SSLBlockingPage::OnProceed() {
507 metrics_helper_->RecordUserDecision( 524 metrics_helper_->RecordUserDecision(
508 SecurityInterstitialMetricsHelper::PROCEED); 525 SecurityInterstitialMetricsHelper::PROCEED);
526
527 // Finish collection information about invalid certificates, if the
528 // user opted in to.
529 FinishCertCollection();
530
509 RecordSSLExpirationPageEventState( 531 RecordSSLExpirationPageEventState(
510 expired_but_previously_allowed_, true, overridable_); 532 expired_but_previously_allowed_, true, overridable_);
511 // Accepting the certificate resumes the loading of the page. 533 // Accepting the certificate resumes the loading of the page.
512 NotifyAllowCertificate(); 534 NotifyAllowCertificate();
513 } 535 }
514 536
515 void SSLBlockingPage::OnDontProceed() { 537 void SSLBlockingPage::OnDontProceed() {
516 metrics_helper_->RecordUserDecision( 538 metrics_helper_->RecordUserDecision(
517 SecurityInterstitialMetricsHelper::DONT_PROCEED); 539 SecurityInterstitialMetricsHelper::DONT_PROCEED);
540
541 // Finish collection information about invalid certificates, if the
542 // user opted in to.
543 FinishCertCollection();
544
518 RecordSSLExpirationPageEventState( 545 RecordSSLExpirationPageEventState(
519 expired_but_previously_allowed_, false, overridable_); 546 expired_but_previously_allowed_, false, overridable_);
520 NotifyDenyCertificate(); 547 NotifyDenyCertificate();
521 } 548 }
522 549
550 void SSLBlockingPage::FinishCertCollectionInternal(
Ryan Sleevi 2015/02/27 00:46:33 There's no need for this to be a static class memb
estark 2015/02/27 02:49:36 Done.
551 scoped_refptr<net::URLRequestContextGetter> request_context_getter,
552 const std::string& hostname,
553 const net::SSLInfo& ssl_info) {
554 net::FraudulentCertificateReporter* reporter =
555 request_context_getter->GetURLRequestContext()
556 ->fraudulent_certificate_reporter();
557 reporter->SendReport(
Ryan Sleevi 2015/02/27 00:46:33 API CONTRACT VIOLATION: The URLRequestContext all
estark 2015/02/27 02:49:36 Done.
558 net::FraudulentCertificateReporter::REPORT_TYPE_EXTENDED_REPORTING,
559 hostname, ssl_info);
560 }
561
562 void SSLBlockingPage::FinishCertCollection() {
563 if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
564 switches::kEnableInvalidCertCollection))
565 return;
566
567 const bool enabled =
568 IsPrefEnabled(prefs::kSafeBrowsingExtendedReportingEnabled);
569 UMA_HISTOGRAM_BOOLEAN("SB2.ExtendedReportingIsEnabled", enabled);
570
571 if (enabled) {
572 scoped_refptr<net::URLRequestContextGetter> request_context_getter =
573 web_contents()->GetBrowserContext()->GetRequestContext();
574 BrowserThread::PostTask(
575 BrowserThread::IO, FROM_HERE,
576 base::Bind(&SSLBlockingPage::FinishCertCollectionInternal,
577 request_context_getter, request_url().host(), ssl_info_));
578 }
579 }
580
523 void SSLBlockingPage::NotifyDenyCertificate() { 581 void SSLBlockingPage::NotifyDenyCertificate() {
524 // It's possible that callback_ may not exist if the user clicks "Proceed" 582 // 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. 583 // followed by pressing the back button before the interstitial is hidden.
526 // In that case the certificate will still be treated as allowed. 584 // In that case the certificate will still be treated as allowed.
527 if (callback_.is_null()) 585 if (callback_.is_null())
528 return; 586 return;
529 587
530 callback_.Run(false); 588 callback_.Run(false);
531 callback_.Reset(); 589 callback_.Reset();
532 } 590 }
(...skipping 27 matching lines...) Expand all
560 event_name.append(kEventNotOverridable); 618 event_name.append(kEventNotOverridable);
561 event_name.append(net::ErrorToString(cert_error_)); 619 event_name.append(net::ErrorToString(cert_error_));
562 return event_name; 620 return event_name;
563 } 621 }
564 622
565 // static 623 // static
566 bool SSLBlockingPage::IsOptionsOverridable(int options_mask) { 624 bool SSLBlockingPage::IsOptionsOverridable(int options_mask) {
567 return (options_mask & SSLBlockingPage::OVERRIDABLE) && 625 return (options_mask & SSLBlockingPage::OVERRIDABLE) &&
568 !(options_mask & SSLBlockingPage::STRICT_ENFORCEMENT); 626 !(options_mask & SSLBlockingPage::STRICT_ENFORCEMENT);
569 } 627 }
628
629 void SSLBlockingPage::PopulateExtendedReportingOption(
630 base::DictionaryValue* load_time_data) {
631 // Only show the checkbox if not off-the-record and if the
632 // command-line option is set.
633 const bool show = !web_contents()->GetBrowserContext()->IsOffTheRecord() &&
634 base::CommandLine::ForCurrentProcess()->HasSwitch(
635 switches::kEnableInvalidCertCollection);
636
637 load_time_data->SetBoolean(interstitials::kDisplayCheckBox, show);
638 if (!show)
639 return;
640
641 load_time_data->SetBoolean(
642 interstitials::kBoxChecked,
643 IsPrefEnabled(prefs::kSafeBrowsingExtendedReportingEnabled));
644
645 const std::string privacy_link = base::StringPrintf(
646 interstitials::kPrivacyLinkHtml,
647 l10n_util::GetStringUTF8(IDS_SAFE_BROWSING_PRIVACY_POLICY_PAGE).c_str());
648
649 load_time_data->SetString(
650 "optInLink",
651 l10n_util::GetStringFUTF16(IDS_SAFE_BROWSING_MALWARE_REPORTING_AGREE,
652 base::UTF8ToUTF16(privacy_link)));
653 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698