Merge pull request #13780 from brave/dapps_active_tab

Dapps active tab

Author: SergeyZhukovsky

browser/brave_wallet/brave_wallet_provider_delegate_impl.cc

@@ -17,6 +17,7 @@
 #include "brave/components/permissions/contexts/brave_wallet_permission_context.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "content/public/browser/render_frame_host.h"
+#include "content/public/browser/visibility.h"
 #include "content/public/browser/web_contents.h"
 
 namespace brave_wallet {
@@ -93,6 +94,12 @@ url::Origin BraveWalletProviderDelegateImpl::GetOrigin() const {
   return rfh ? rfh->GetLastCommittedOrigin() : url::Origin();
 }
 
+bool BraveWalletProviderDelegateImpl::IsTabVisible() {
+  return web_contents_
+             ? web_contents_->GetVisibility() == content::Visibility::VISIBLE
+             : false;
+}
+
 void BraveWalletProviderDelegateImpl::ShowPanel() {
   ::brave_wallet::ShowPanel(web_contents_);
 }

browser/brave_wallet/brave_wallet_provider_delegate_impl.h

@@ -35,6 +35,7 @@ class BraveWalletProviderDelegateImpl : public BraveWalletProviderDelegate,
       const BraveWalletProviderDelegateImpl&) = delete;
   ~BraveWalletProviderDelegateImpl() override;
 
+  bool IsTabVisible() override;
   void ShowPanel() override;
   void WalletInteractionDetected() override;
   void ShowWalletOnboarding() override;

browser/brave_wallet/ethereum_provider_browsertest.cc

@@ -0,0 +1,145 @@
+/* Copyright (c) 2022 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "base/command_line.h"
+#include "base/memory/raw_ptr.h"
+#include "base/path_service.h"
+#include "base/test/bind.h"
+#include "brave/browser/brave_wallet/keyring_service_factory.h"
+#include "brave/components/brave_wallet/browser/keyring_service.h"
+#include "brave/components/constants/brave_paths.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/test/base/in_process_browser_test.h"
+#include "chrome/test/base/ui_test_utils.h"
+#include "components/network_session_configurator/common/network_switches.h"
+#include "content/public/browser/web_contents.h"
+#include "content/public/test/browser_test.h"
+#include "content/public/test/browser_test_utils.h"
+#include "content/public/test/test_utils.h"
+#include "net/dns/mock_host_resolver.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
+#include "url/gurl.h"
+
+namespace {
+
+std::string CheckForEventScript(const std::string& event_var) {
+  return base::StringPrintf(R"(function waitForEvent() {
+             if (%s) {
+               window.domAutomationController.send(true);
+             }
+            }
+          setInterval(waitForEvent, 100);)",
+                            event_var.c_str());
+}
+
+}  // namespace
+
+namespace brave_wallet {
+
+class EthereumProviderBrowserTest : public InProcessBrowserTest {
+ public:
+  EthereumProviderBrowserTest()
+      : https_server_(net::EmbeddedTestServer::TYPE_HTTPS) {}
+
+  ~EthereumProviderBrowserTest() override = default;
+
+  void SetUpCommandLine(base::CommandLine* command_line) override {
+    InProcessBrowserTest::SetUpCommandLine(command_line);
+    command_line->AppendSwitch(switches::kIgnoreCertificateErrors);
+  }
+
+  void SetUpOnMainThread() override {
+    host_resolver()->AddRule("*", "127.0.0.1");
+
+    brave::RegisterPathProvider();
+    base::FilePath test_data_dir;
+    base::PathService::Get(brave::DIR_TEST_DATA, &test_data_dir);
+    test_data_dir = test_data_dir.AppendASCII("brave-wallet");
+    https_server_.ServeFilesFromDirectory(test_data_dir);
+    https_server_.SetSSLConfig(net::EmbeddedTestServer::CERT_TEST_NAMES);
+    ASSERT_TRUE(https_server()->Start());
+
+    keyring_service_ =
+        KeyringServiceFactory::GetServiceForContext(browser()->profile());
+  }
+
+  content::WebContents* web_contents() {
+    return browser()->tab_strip_model()->GetActiveWebContents();
+  }
+
+  net::EmbeddedTestServer* https_server() { return &https_server_; }
+
+  void RestoreWallet() {
+    const char mnemonic[] =
+        "drip caution abandon festival order clown oven regular absorb "
+        "evidence crew where";
+    base::RunLoop run_loop;
+    keyring_service_->RestoreWallet(
+        mnemonic, "brave123", false,
+        base::BindLambdaForTesting([&](bool success) {
+          ASSERT_TRUE(success);
+          run_loop.Quit();
+        }));
+    run_loop.Run();
+  }
+
+ private:
+  net::test_server::EmbeddedTestServer https_server_;
+  raw_ptr<KeyringService> keyring_service_ = nullptr;
+};
+
+IN_PROC_BROWSER_TEST_F(EthereumProviderBrowserTest, InactiveTabRequest) {
+  RestoreWallet();
+  GURL url = https_server()->GetURL("a.com", "/ethereum_provider.html");
+
+  ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), url));
+  content::WebContents* first_tab_web_contents = web_contents();
+
+  // Add a new tab and switch to it
+  ASSERT_TRUE(AddTabAtIndex(1, url, ui::PAGE_TRANSITION_TYPED));
+  ASSERT_EQ(browser()->tab_strip_model()->active_index(), 1);
+
+  // Add an asset using the first page web contents
+  ASSERT_TRUE(
+      ExecJs(first_tab_web_contents,
+             "wallet_watchAsset('ERC20', "
+             "'0x6B175474E89094C44Da98b954EedeAC495271d0F', 'USDC', 6)"));
+  base::RunLoop().RunUntilIdle();
+
+  auto result_first =
+      EvalJs(first_tab_web_contents, CheckForEventScript("inactiveTabError"),
+             content::EXECUTE_SCRIPT_USE_MANUAL_REPLY);
+  EXPECT_EQ(base::Value(true), result_first.value);
+}
+
+IN_PROC_BROWSER_TEST_F(EthereumProviderBrowserTest, ActiveTabRequest) {
+  RestoreWallet();
+  GURL url = https_server()->GetURL("a.com", "/ethereum_provider.html");
+
+  ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), url));
+
+  // Add a new tab and switch to it
+  ASSERT_TRUE(AddTabAtIndex(1, url, ui::PAGE_TRANSITION_TYPED));
+  ASSERT_EQ(browser()->tab_strip_model()->active_index(), 1);
+
+  // Switch back to first tab
+  browser()->tab_strip_model()->ActivateTabAt(0);
+  ASSERT_EQ(browser()->tab_strip_model()->active_index(), 0);
+
+  // Add an asset using the first page web contents
+  ASSERT_TRUE(
+      ExecJs(web_contents(),
+             "wallet_watchAsset('ERC20', "
+             "'0x6B175474E89094C44Da98b954EedeAC495271d0F', 'USDC', 6)"));
+  base::RunLoop().RunUntilIdle();
+
+  auto result_first =
+      EvalJs(web_contents(), CheckForEventScript("!inactiveTabError"),
+             content::EXECUTE_SCRIPT_USE_MANUAL_REPLY);
+  EXPECT_EQ(base::Value(true), result_first.value);
+}
+
+}  // namespace brave_wallet

components/brave_wallet/browser/brave_wallet_provider_delegate.h

@@ -31,6 +31,7 @@ class BraveWalletProviderDelegate {
       delete;
   virtual ~BraveWalletProviderDelegate() = default;
 
+  virtual bool IsTabVisible() = 0;
   virtual void ShowPanel() = 0;
   virtual void WalletInteractionDetected() = 0;
   virtual void ShowWalletOnboarding() = 0;

components/brave_wallet/browser/ethereum_provider_impl.cc

@@ -1000,6 +1000,23 @@ void EthereumProviderImpl::CommonRequestOrSendAsync(base::Value input_value,
     return;
   }
 
+  // That check prevents from pop ups from backgrounded pages.
+  // We need to add any method that requires a dialog to interact with.
+  if ((method == kEthRequestAccounts || method == kAddEthereumChainMethod ||
+       method == kSwitchEthereumChainMethod || method == kEthSendTransaction ||
+       method == kEthSign || method == kPersonalSign ||
+       method == kPersonalEcRecover || method == kEthSignTypedDataV3 ||
+       method == kEthSignTypedDataV4 || method == kEthGetEncryptionPublicKey ||
+       method == kEthDecrypt || method == kWalletWatchAsset ||
+       method == kRequestPermissionsMethod) &&
+      !delegate_->IsTabVisible()) {
+    SendErrorOnRequest(
+        mojom::ProviderError::kResourceUnavailable,
+        l10n_util::GetStringUTF8(IDS_WALLET_TAB_IS_NOT_ACTIVE_ERROR),
+        std::move(callback), base::Value());
+    return;
+  }
+
   if (method == kEthAccounts) {
     GetAllowedAccounts(
         false,
@@ -1244,6 +1261,13 @@ void EthereumProviderImpl::ContinueRequestEthereumPermissions(
 }
 
 void EthereumProviderImpl::Enable(EnableCallback callback) {
+  if (!delegate_->IsTabVisible()) {
+    SendErrorOnRequest(
+        mojom::ProviderError::kResourceUnavailable,
+        l10n_util::GetStringUTF8(IDS_WALLET_TAB_IS_NOT_ACTIVE_ERROR),
+        std::move(callback), base::Value());
+    return;
+  }
   RequestEthereumPermissions(std::move(callback), base::Value(), "",
                              delegate_->GetOrigin());
   delegate_->WalletInteractionDetected();

components/resources/wallet_strings.grdp

@@ -468,4 +468,5 @@
   <message name="IDS_WALLET_TRANSACTION_STATUS_UPDATE_MESSAGE_TITLE_CONFIRMED" desc="Notification message title when transaction confirmed">Transaction confirmed</message>
   <message name="IDS_WALLET_TRANSACTION_STATUS_UPDATE_MESSAGE_TITLE_ERROR" desc="Notification message title when transaction error">Transaction error</message>
  <message name="IDS_WALLET_TRANSACTION_STATUS_UPDATE_MESSAGE_TITLE_DROPPED" desc="Notification message title when transaction dropped">Transaction dropped</message>  
+ <message name="IDS_WALLET_TAB_IS_NOT_ACTIVE_ERROR" desc="Error message if it comes from an inactive tab">The tab is not active</message>
 </grit-part>

ios/browser/api/brave_wallet/brave_wallet_provider_delegate_ios+private.h

@@ -25,6 +25,7 @@ class BraveWalletProviderDelegateBridge
  private:
   __weak id<BraveWalletProviderDelegate> bridge_;
 
+  bool IsTabVisible() override;
   void ShowPanel() override;
   void WalletInteractionDetected() override;
   url::Origin GetOrigin() const override;

ios/browser/api/brave_wallet/brave_wallet_provider_delegate_ios.h

@@ -24,6 +24,7 @@ typedef void (^GetAllowedAccountsCallback)(bool success,
 
 OBJC_EXPORT
 @protocol BraveWalletProviderDelegate
+- (bool)isTabVisible;
 - (void)showPanel;
 - (URLOriginIOS*)getOrigin;
 - (void)walletInteractionDetected;

ios/browser/api/brave_wallet/brave_wallet_provider_delegate_ios.mm

@@ -14,6 +14,10 @@
 
 namespace brave_wallet {
 
+bool BraveWalletProviderDelegateBridge::IsTabVisible() {
+  return [bridge_ isTabVisible];
+}
+
 void BraveWalletProviderDelegateBridge::ShowPanel() {
   [bridge_ showPanel];
 }

test/BUILD.gn

@@ -648,6 +648,7 @@ if (!is_android) {
       "//brave/browser/brave_wallet/brave_wallet_service_browsertest.cc",
       "//brave/browser/brave_wallet/brave_wallet_sign_message_browsertest.cc",
       "//brave/browser/brave_wallet/brave_wallet_tab_helper_browsertest.cc",
+      "//brave/browser/brave_wallet/ethereum_provider_browsertest.cc",
       "//brave/browser/brave_wallet/send_transaction_browsertest.cc",
       "//brave/browser/brave_wallet/solana_provider_browsertest.cc",
       "//brave/browser/brave_wallet/solana_provider_renderer_browsertest.cc",

test/data/brave-wallet/ethereum_provider.html

@@ -0,0 +1,32 @@
+<html>
+
+<script>
+  var inactiveTabError
+  function wallet_watchAsset(type, address, symbol, decimals) {
+    const params = {
+      options: {
+        address,
+        symbol,
+        decimals
+      },
+      type
+    }
+
+    window.ethereum.request({
+      method: 'wallet_watchAsset',
+      params
+    }).then(result => {
+      inactiveTabError = false
+    }).catch(error => {
+      inactiveTabError = false
+      if (error.code == -32002) {
+        inactiveTabError = true
+      }
+    })
+  }
+</script>
+
+<body>
+</body>
+</html>
+