Merge pull request #4828 from brave/fix-8524

Shows brave://wallet alias under phishing detection and ENS redirect routes
brave · Mar 4, 2020 · 3867e4b · 3867e4b
2 parents cec5d04 + 39218de
commit 3867e4b
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 0 deletions.
diff --git a/browser/ui/toolbar/brave_location_bar_model_delegate.cc b/browser/ui/toolbar/brave_location_bar_model_delegate.cc
@@ -38,6 +38,16 @@ void BraveLocationBarModelDelegate::FormattedStringFromURL(const GURL& url,
         0,
         base::UTF8ToUTF16(ethereum_remote_client_base_url),
         base::UTF8ToUTF16("brave://wallet"));
+    base::ReplaceFirstSubstringAfterOffset(
+        new_formatted_url,
+        0,
+        base::UTF8ToUTF16(ethereum_remote_client_phishing_url),
+        base::UTF8ToUTF16("brave://wallet"));
+    base::ReplaceFirstSubstringAfterOffset(
+        new_formatted_url,
+        0,
+        base::UTF8ToUTF16(ethereum_remote_client_ens_redirect_url),
+        base::UTF8ToUTF16("brave://wallet"));
   }
 #endif
 }

diff --git a/browser/ui/toolbar/brave_location_bar_model_delegate_unittest.cc b/browser/ui/toolbar/brave_location_bar_model_delegate_unittest.cc
@@ -23,6 +23,20 @@ TEST_F(BraveLocationBarModelDelegateTest, ResolvesEthereumRemoteClient) {
   BraveLocationBarModelDelegate::FormattedStringFromURL(url, &formatted_url);
   ASSERT_STREQ(base::UTF16ToASCII(formatted_url).c_str(), "brave://wallet");
 }
+TEST_F(BraveLocationBarModelDelegateTest,
+    ResolvesEthereumRemoteClientPhishingRoute) {
+  GURL url(ethereum_remote_client_phishing_url);
+  base::string16 formatted_url = base::UTF8ToUTF16(url.spec());
+  BraveLocationBarModelDelegate::FormattedStringFromURL(url, &formatted_url);
+  ASSERT_STREQ(base::UTF16ToASCII(formatted_url).c_str(), "brave://wallet");
+}
+TEST_F(BraveLocationBarModelDelegateTest,
+    ResolvesEthereumRemoteClientENSRoute) {
+  GURL url(ethereum_remote_client_ens_redirect_url);
+  base::string16 formatted_url = base::UTF8ToUTF16(url.spec());
+  BraveLocationBarModelDelegate::FormattedStringFromURL(url, &formatted_url);
+  ASSERT_STREQ(base::UTF16ToASCII(formatted_url).c_str(), "brave://wallet");
+}
 #endif
 
 TEST_F(BraveLocationBarModelDelegateTest, ResolvesChromeSchemeToBrave) {

diff --git a/common/extensions/extension_constants.cc b/common/extensions/extension_constants.cc
@@ -25,6 +25,10 @@ const char ethereum_remote_client_extension_public_key[] =
     "EGySVmv6czOI5eJYezWXwIDAQAB";
 const char ethereum_remote_client_base_url[] =
     "chrome-extension://odbfpeeihdkbihmopkbjmoonfanlbfcl/home.html";
+const char ethereum_remote_client_phishing_url[] =
+    "chrome-extension://odbfpeeihdkbihmopkbjmoonfanlbfcl/phishing.html";
+const char ethereum_remote_client_ens_redirect_url[] =
+    "chrome-extension://odbfpeeihdkbihmopkbjmoonfanlbfcl/loading.html";
 const char ethereum_remote_client_host[] = "wallet";
 const char metamask_extension_id[] = "nkbihfbeogaeaoehlefnkodbefgpgknn";
 

diff --git a/common/extensions/extension_constants.h b/common/extensions/extension_constants.h
@@ -18,6 +18,8 @@ extern const char ethereum_remote_client_extension_id[];
 extern const char ethereum_remote_client_extension_name[];
 extern const char ethereum_remote_client_extension_public_key[];
 extern const char ethereum_remote_client_base_url[];
+extern const char ethereum_remote_client_phishing_url[];
+extern const char ethereum_remote_client_ens_redirect_url[];
 extern const char ethereum_remote_client_host[];
 extern const char metamask_extension_id[];