Detect CSP errors from translate.js and pass it back to native code.

Currently all CSP errors are reported wrongly as INITIALIZATION_ERROR,
this change will report it as BAD_ORIGIN.

Change-Id: I2cc09d9dcd722ab0657605e540acac69e142eb6c
Bug: 686364
Reviewed-on: https://chromium-review.googlesource.com/1141047
Commit-Queue: John Wu <jzw@chromium.org>
Reviewed-by: David Roger <droger@chromium.org>
Reviewed-by: Eugene But <eugenebut@chromium.org>
Cr-Commit-Position: refs/heads/master@{#585580}

components/translate/core/browser/resources/translate.js

@@ -114,6 +114,16 @@ cr.googleTranslate = (function() {
    */
   var resultCallback;
 
+  /**
+   * Listens to security policy violations to set |errorCode|.
+   */
+  document.addEventListener('securitypolicyviolation', function(event) {
+    if (securityOrigin.startsWith(event.blockedURI)) {
+      errorCode = ERROR['BAD_ORIGIN'];
+      invokeReadyCallback();
+    }
+  });
+
   function checkLibReady() {
     if (lib.isAvailable()) {
       readyTime = performance.now();

components/translate/ios/browser/ios_translate_driver.h

@@ -12,6 +12,7 @@
 #include "base/memory/weak_ptr.h"
 #include "components/language/ios/browser/ios_language_detection_tab_helper.h"
 #include "components/translate/core/browser/translate_driver.h"
+#include "components/translate/core/common/translate_errors.h"
 #include "components/translate/ios/browser/language_detection_controller.h"
 #include "components/translate/ios/browser/translate_controller.h"
 #include "ios/web/public/web_state/web_state_observer.h"
@@ -86,10 +87,10 @@ class IOSTranslateDriver : public TranslateDriver,
   void OnLanguageDetermined(const LanguageDetectionDetails& details);
 
   // TranslateController::Observer methods.
-  void OnTranslateScriptReady(bool success,
+  void OnTranslateScriptReady(TranslateErrors::Type error_type,
                               double load_time,
                               double ready_time) override;
-  void OnTranslateComplete(bool success,
+  void OnTranslateComplete(TranslateErrors::Type error_type,
                            const std::string& original_language,
                            double translation_time) override;
 

components/translate/ios/browser/ios_translate_driver.mm

@@ -13,7 +13,6 @@
 #include "components/translate/core/browser/translate_manager.h"
 #include "components/translate/core/common/language_detection_details.h"
 #include "components/translate/core/common/translate_constants.h"
-#include "components/translate/core/common/translate_errors.h"
 #include "components/translate/core/common/translate_metrics.h"
 #import "components/translate/ios/browser/js_language_detection_manager.h"
 #import "components/translate/ios/browser/js_translate_manager.h"
@@ -227,15 +226,16 @@ bool IOSTranslateDriver::IsPageValid(int page_seq_no) const {
 
 // TranslateController::Observer implementation.
 
-void IOSTranslateDriver::OnTranslateScriptReady(bool success,
-                                                double load_time,
-                                                double ready_time) {
+void IOSTranslateDriver::OnTranslateScriptReady(
+    TranslateErrors::Type error_type,
+    double load_time,
+    double ready_time) {
   if (!IsPageValid(pending_page_seq_no_))
     return;
 
-  if (!success) {
+  if (error_type != TranslateErrors::NONE) {
     translate_manager_->PageTranslated(source_language_, target_language_,
-                                       TranslateErrors::INITIALIZATION_ERROR);
+                                       error_type);
     return;
   }
 
@@ -249,16 +249,15 @@ void IOSTranslateDriver::OnTranslateScriptReady(bool success,
 }
 
 void IOSTranslateDriver::OnTranslateComplete(
-    bool success,
+    TranslateErrors::Type error_type,
     const std::string& original_language,
     double translation_time) {
   if (!IsPageValid(pending_page_seq_no_))
     return;
 
-  if (!success) {
-    // TODO(toyoshim): Check |errorCode| of translate.js and notify it here.
+  if (error_type != TranslateErrors::NONE) {
     translate_manager_->PageTranslated(source_language_, target_language_,
-                                       TranslateErrors::TRANSLATION_ERROR);
+                                       error_type);
   }
 
   TranslationDidSucceed(source_language_, target_language_,

components/translate/ios/browser/resources/translate_ios.js

@@ -16,7 +16,7 @@
 cr.googleTranslate.readyCallback = function() {
   __gCrWeb.message.invokeOnHost({
       'command': 'translate.ready',
-      'timeout': cr.googleTranslate.error,
+      'errorCode': cr.googleTranslate.errorCode,
       'loadTime': cr.googleTranslate.loadTime,
       'readyTime': cr.googleTranslate.readyTime});
 }
@@ -27,7 +27,7 @@ cr.googleTranslate.readyCallback = function() {
 cr.googleTranslate.resultCallback = function() {
   __gCrWeb.message.invokeOnHost({
       'command': 'translate.status',
-      'success': !cr.googleTranslate.error,
+      'errorCode': cr.googleTranslate.errorCode,
       'originalPageLanguage': cr.googleTranslate.sourceLang,
       'translationTime': cr.googleTranslate.translationTime});
 }

components/translate/ios/browser/translate_controller.h

@@ -11,6 +11,7 @@
 #include "base/mac/scoped_nsobject.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
+#include "components/translate/core/common/translate_errors.h"
 #include "ios/web/public/web_state/web_state_observer.h"
 
 @class JsTranslateManager;
@@ -34,13 +35,14 @@ class TranslateController : public web::WebStateObserver {
   class Observer {
    public:
     // Called when the translate script is ready.
-    // In case of timeout, |success| is false.
-    virtual void OnTranslateScriptReady(bool success,
+    // |error_type| Indicates error code.
+    virtual void OnTranslateScriptReady(TranslateErrors::Type error_type,
                                         double load_time,
                                         double ready_time) = 0;
 
     // Called when the translation is complete.
-    virtual void OnTranslateComplete(bool success,
+    // |error_type| Indicates error code.
+    virtual void OnTranslateComplete(TranslateErrors::Type error_type,
                                      const std::string& original_language,
                                      double translation_time) = 0;
   };

components/translate/ios/browser/translate_controller.mm

@@ -94,17 +94,21 @@ bool TranslateController::OnJavascriptCommandReceived(
 
 bool TranslateController::OnTranslateReady(
     const base::DictionaryValue& command) {
-  if (!command.HasKey("timeout")) {
+  double error_code = 0.;
+  double load_time = 0.;
+  double ready_time = 0.;
+
+  if (!command.HasKey("errorCode") ||
+      !command.GetDouble("errorCode", &error_code) ||
+      error_code < TranslateErrors::NONE ||
+      error_code >= TranslateErrors::TRANSLATE_ERROR_MAX) {
     NOTREACHED();
     return false;
   }
 
-  bool timeout = false;
-  double load_time = 0.;
-  double ready_time = 0.;
-
-  command.GetBoolean("timeout", &timeout);
-  if (!timeout) {
+  TranslateErrors::Type error_type =
+      static_cast<TranslateErrors::Type>(error_code);
+  if (error_type == TranslateErrors::NONE) {
     if (!command.HasKey("loadTime") || !command.HasKey("readyTime")) {
       NOTREACHED();
       return false;
@@ -113,23 +117,27 @@ bool TranslateController::OnTranslateReady(
     command.GetDouble("readyTime", &ready_time);
   }
   if (observer_)
-    observer_->OnTranslateScriptReady(!timeout, load_time, ready_time);
+    observer_->OnTranslateScriptReady(error_type, load_time, ready_time);
   return true;
 }
 
 bool TranslateController::OnTranslateComplete(
     const base::DictionaryValue& command) {
-  if (!command.HasKey("success")) {
+  double error_code = 0.;
+  std::string original_language;
+  double translation_time = 0.;
+
+  if (!command.HasKey("errorCode") ||
+      !command.GetDouble("errorCode", &error_code) ||
+      error_code < TranslateErrors::NONE ||
+      error_code >= TranslateErrors::TRANSLATE_ERROR_MAX) {
     NOTREACHED();
     return false;
   }
 
-  bool success = false;
-  std::string original_language;
-  double translation_time = 0.;
-
-  command.GetBoolean("success", &success);
-  if (success) {
+  TranslateErrors::Type error_type =
+      static_cast<TranslateErrors::Type>(error_code);
+  if (error_type == TranslateErrors::NONE) {
     if (!command.HasKey("originalPageLanguage") ||
         !command.HasKey("translationTime")) {
       NOTREACHED();
@@ -140,7 +148,7 @@ bool TranslateController::OnTranslateComplete(
   }
 
   if (observer_)
-    observer_->OnTranslateComplete(success, original_language,
+    observer_->OnTranslateComplete(error_type, original_language,
                                    translation_time);
   return true;
 }

components/translate/ios/browser/translate_controller_unittest.mm

@@ -24,7 +24,7 @@ class TranslateControllerTest : public PlatformTest,
  protected:
   TranslateControllerTest()
       : test_web_state_(new web::TestWebState),
-        success_(false),
+        error_type_(TranslateErrors::Type::NONE),
         ready_time_(0),
         load_time_(0),
         translation_time_(0),
@@ -38,20 +38,20 @@ class TranslateControllerTest : public PlatformTest,
   }
 
   // TranslateController::Observer methods.
-  void OnTranslateScriptReady(bool success,
+  void OnTranslateScriptReady(TranslateErrors::Type error_type,
                               double load_time,
                               double ready_time) override {
     on_script_ready_called_ = true;
-    success_ = success;
+    error_type_ = error_type;
     load_time_ = load_time;
     ready_time_ = ready_time;
   }
 
-  void OnTranslateComplete(bool success,
+  void OnTranslateComplete(TranslateErrors::Type error_type,
                            const std::string& original_language,
                            double translation_time) override {
     on_translate_complete_called_ = true;
-    success_ = success;
+    error_type_ = error_type;
     original_language_ = original_language;
     translation_time_ = translation_time;
   }
@@ -59,7 +59,7 @@ class TranslateControllerTest : public PlatformTest,
   std::unique_ptr<web::TestWebState> test_web_state_;
   id mock_js_translate_manager_;
   std::unique_ptr<TranslateController> translate_controller_;
-  bool success_;
+  TranslateErrors::Type error_type_;
   double ready_time_;
   double load_time_;
   std::string original_language_;
@@ -80,7 +80,7 @@ TEST_F(TranslateControllerTest, OnJavascriptCommandReceived) {
 TEST_F(TranslateControllerTest, OnIFrameJavascriptCommandReceived) {
   base::DictionaryValue command;
   command.SetString("command", "translate.ready");
-  command.SetBoolean("timeout", true);
+  command.SetDouble("errorCode", TranslateErrors::TRANSLATION_TIMEOUT);
   command.SetDouble("loadTime", .0);
   command.SetDouble("readyTime", .0);
   EXPECT_FALSE(translate_controller_->OnJavascriptCommandReceived(
@@ -93,7 +93,7 @@ TEST_F(TranslateControllerTest, OnIFrameJavascriptCommandReceived) {
 TEST_F(TranslateControllerTest, OnTranslateScriptReadyTimeoutCalled) {
   base::DictionaryValue command;
   command.SetString("command", "translate.ready");
-  command.SetBoolean("timeout", true);
+  command.SetDouble("errorCode", TranslateErrors::TRANSLATION_TIMEOUT);
   command.SetDouble("loadTime", .0);
   command.SetDouble("readyTime", .0);
   EXPECT_TRUE(translate_controller_->OnJavascriptCommandReceived(
@@ -101,11 +101,11 @@ TEST_F(TranslateControllerTest, OnTranslateScriptReadyTimeoutCalled) {
       /*is_main_frame=*/true));
   EXPECT_TRUE(on_script_ready_called_);
   EXPECT_FALSE(on_translate_complete_called_);
-  EXPECT_FALSE(success_);
+  EXPECT_FALSE(error_type_ == TranslateErrors::NONE);
 }
 
 // Tests that OnTranslateScriptReady() is called with the right parameters when
-// a |translate.ready| message is recieved from the JS side.
+// a |translate.ready| message is received from the JS side.
 TEST_F(TranslateControllerTest, OnTranslateScriptReadyCalled) {
   // Arbitrary values.
   double some_load_time = 23.1;
@@ -113,7 +113,7 @@ TEST_F(TranslateControllerTest, OnTranslateScriptReadyCalled) {
 
   base::DictionaryValue command;
   command.SetString("command", "translate.ready");
-  command.SetBoolean("timeout", false);
+  command.SetDouble("errorCode", TranslateErrors::NONE);
   command.SetDouble("loadTime", some_load_time);
   command.SetDouble("readyTime", some_ready_time);
   EXPECT_TRUE(translate_controller_->OnJavascriptCommandReceived(
@@ -121,13 +121,13 @@ TEST_F(TranslateControllerTest, OnTranslateScriptReadyCalled) {
       /*is_main_frame=*/true));
   EXPECT_TRUE(on_script_ready_called_);
   EXPECT_FALSE(on_translate_complete_called_);
-  EXPECT_TRUE(success_);
+  EXPECT_TRUE(error_type_ == TranslateErrors::NONE);
   EXPECT_EQ(some_load_time, load_time_);
   EXPECT_EQ(some_ready_time, ready_time_);
 }
 
 // Tests that OnTranslateComplete() is called with the right parameters when a
-// |translate.status| message is recieved from the JS side.
+// |translate.status| message is received from the JS side.
 TEST_F(TranslateControllerTest, TranslationSuccess) {
   // Arbitrary values.
   std::string some_original_language("en");
@@ -135,7 +135,7 @@ TEST_F(TranslateControllerTest, TranslationSuccess) {
 
   base::DictionaryValue command;
   command.SetString("command", "translate.status");
-  command.SetBoolean("success", true);
+  command.SetDouble("errorCode", TranslateErrors::NONE);
   command.SetString("originalPageLanguage", some_original_language);
   command.SetDouble("translationTime", some_translation_time);
   EXPECT_TRUE(translate_controller_->OnJavascriptCommandReceived(
@@ -143,23 +143,23 @@ TEST_F(TranslateControllerTest, TranslationSuccess) {
       /*is_main_frame=*/true));
   EXPECT_FALSE(on_script_ready_called_);
   EXPECT_TRUE(on_translate_complete_called_);
-  EXPECT_TRUE(success_);
+  EXPECT_TRUE(error_type_ == TranslateErrors::NONE);
   EXPECT_EQ(some_original_language, original_language_);
   EXPECT_EQ(some_translation_time, translation_time_);
 }
 
 // Tests that OnTranslateComplete() is called with the right parameters when a
-// |translate.status| message is recieved from the JS side.
+// |translate.status| message is received from the JS side.
 TEST_F(TranslateControllerTest, TranslationFailure) {
   base::DictionaryValue command;
   command.SetString("command", "translate.status");
-  command.SetBoolean("success", false);
+  command.SetDouble("errorCode", TranslateErrors::INITIALIZATION_ERROR);
   EXPECT_TRUE(translate_controller_->OnJavascriptCommandReceived(
       command, GURL("http://google.com"), /*interacting*/ false,
       /*is_main_frame=*/true));
   EXPECT_FALSE(on_script_ready_called_);
   EXPECT_TRUE(on_translate_complete_called_);
-  EXPECT_FALSE(success_);
+  EXPECT_FALSE(error_type_ == TranslateErrors::NONE);
 }
 
 }  // namespace translate