Make commands consistent across security interstitials

chrome/browser/ssl/ssl_blocking_page.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ssl/ssl_blocking_page.h"
 
 #include "base/build_time.h"
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"
 #include "base/i18n/time_formatting.h"
@@ skipping 431 matching lines @@
       ssl_info_.cert.get(), web_contents()->GetRenderProcessHost()->GetID());
   DCHECK(cert_id);
 
   entry->GetSSL().security_style =
       content::SECURITY_STYLE_AUTHENTICATION_BROKEN;
   entry->GetSSL().cert_id = cert_id;
   entry->GetSSL().cert_status = ssl_info_.cert_status;
   entry->GetSSL().security_bits = ssl_info_.security_bits;
 }
 
-// This handles the commands sent from the interstitial JavaScript. They are
-// defined in chrome/browser/resources/ssl/ssl_errors_common.js.
+// This handles the commands sent from the interstitial JavaScript.
 // DO NOT reorder or change this logic without also changing the JavaScript!
 void SSLBlockingPage::CommandReceived(const std::string& command) {
   int cmd = 0;
   bool retval = base::StringToInt(command, &cmd);
   DCHECK(retval);
   switch (cmd) {
     case CMD_DONT_PROCEED: {
       interstitial_page()->DontProceed();
       break;
     }
     case CMD_PROCEED: {
       if (danger_overridable_) {
         interstitial_page()->Proceed();
       }
       break;
     }
-    case CMD_MORE: {
+    case CMD_SHOW_MORE_SECTION: {
       metrics_helper_->RecordUserInteraction(
           SecurityInterstitialMetricsHelper::SHOW_ADVANCED);
       break;
     }
-    case CMD_RELOAD: {
-      metrics_helper_->RecordUserInteraction(
-          SecurityInterstitialMetricsHelper::RELOAD);
-      // The interstitial can't refresh itself.
-      web_contents()->GetController().Reload(true);
-      break;
-    }
-    case CMD_HELP: {
+    case CMD_OPEN_HELP_CENTER: {
       metrics_helper_->RecordUserInteraction(
           SecurityInterstitialMetricsHelper::SHOW_LEARN_MORE);
       content::NavigationController::LoadURLParams help_page_params(
           google_util::AppendGoogleLocaleParam(
               GURL(kHelpURL), g_browser_process->GetApplicationLocale()));
       web_contents()->GetController().LoadURLWithParams(help_page_params);
       break;
     }
-    case CMD_CLOCK: {
+    case CMD_RELOAD: {
+      metrics_helper_->RecordUserInteraction(
+          SecurityInterstitialMetricsHelper::RELOAD);
+      // The interstitial can't refresh itself.
+      web_contents()->GetController().Reload(true);
+      break;
+    }
+    case CMD_OPEN_DATE_SETTINGS: {
       metrics_helper_->RecordUserInteraction(
           SecurityInterstitialMetricsHelper::OPEN_TIME_SETTINGS);
       LaunchDateAndTimeSettings();
       break;
     }
-    default: {
-      NOTREACHED();
-    }
+    case CMD_OPEN_DIAGNOSTIC:
+      // Google doesn't currently have a transparency report for SSL.
+    case CMD_DO_REPORT:
+    case CMD_DONT_REPORT:
+    case CMD_OPEN_REPORTING_PRIVACY:
+      // Chrome doesn't currently do Extended Reporting for SSL.
+      NOTREACHED() << "Unexpected command: " << command;

[Bernhard Bauer, 2015/03/11 16:19:20]

This changes the semantics from the previous version; before, we would ignore
these commands, and now we DCHECK. I assume that's on purpose?

[felt, 2015/03/11 16:25:21]

Yes, I changed my mind and decided a DCHECK would be more appropriate (since
receiving these commands would mean there is a bug in the JavaScript logic).

   }
 }
 
 void SSLBlockingPage::OverrideRendererPrefs(
       content::RendererPreferences* prefs) {
   Profile* profile = Profile::FromBrowserContext(
       web_contents()->GetBrowserContext());
   renderer_preferences_util::UpdateFromSystemSettings(
       prefs, profile, web_contents());
 }
@@ skipping 55 matching lines @@
     event_name.append(kEventNotOverridable);
   event_name.append(net::ErrorToString(cert_error_));
   return event_name;
 }
 
 // static
 bool SSLBlockingPage::IsOptionsOverridable(int options_mask) {
   return (options_mask & SSLBlockingPage::OVERRIDABLE) &&
          !(options_mask & SSLBlockingPage::STRICT_ENFORCEMENT);
 }