ENS offchain lookup consent (#15010)

brave · Sep 21, 2022 · bbdc467 · bbdc467
1 parent 0d289d6
commit bbdc467
Show file tree

Hide file tree

Showing 68 changed files with 1,170 additions and 641 deletions.
diff --git a/android/BUILD.gn b/android/BUILD.gn
@@ -8,7 +8,7 @@ declare_args() {
 java_cpp_enum("brave_android_java_enums_srcjar") {
   sources = [
     "//brave/chromium_src/chrome/browser/notifications/notification_handler.h",
-    "//brave/components/decentralized_dns/constants.h",
+    "//brave/components/decentralized_dns/core/constants.h",
   ]
 }
 

diff --git a/app/brave_settings_strings.grdp b/app/brave_settings_strings.grdp
@@ -670,6 +670,12 @@
   <message name="IDS_SETTINGS_RESOLVE_ENS_DESC" desc="The description for how to handle ENS">
     Method to resolve Ethereum Name Service (ENS)
   </message>
+  <message name="IDS_SETTINGS_ENABLE_ENS_OFFCHAIN_LOOKUP_TITLE" desc="ENS offchain lookup method title">
+    Allow ENS offchain lookup.
+  </message>
+  <message name="IDS_SETTINGS_ENABLE_ENS_OFFCHAIN_LOOKUP_DESC" desc="ENS offchain lookup method desc">
+    <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>Learn More<ph name="END_LINK">&lt;/a&gt;</ph> about ENS offchain lookup privacy considerations.
+  </message>
   <message name="IDS_SETTINGS_ENABLE_TOR_TITLE" desc="Text fragment for enabling tor component">
     Private window with Tor
   </message>

diff --git a/browser/android/preferences/brave_pref_service_bridge.cc b/browser/android/preferences/brave_pref_service_bridge.cc
@@ -16,7 +16,7 @@
 #include "brave/components/brave_today/common/pref_names.h"
 #include "brave/components/constants/pref_names.h"
 #include "brave/components/de_amp/common/pref_names.h"
-#include "brave/components/decentralized_dns/pref_names.h"
+#include "brave/components/decentralized_dns/core/pref_names.h"
 #include "brave/components/ipfs/buildflags/buildflags.h"
 #include "brave/components/p3a/buildflags.h"
 #include "build/build_config.h"

diff --git a/browser/brave_content_browser_client.cc b/browser/brave_content_browser_client.cc
@@ -61,7 +61,7 @@
 #include "brave/components/cosmetic_filters/common/cosmetic_filters.mojom.h"
 #include "brave/components/de_amp/browser/de_amp_throttle.h"
 #include "brave/components/debounce/browser/debounce_navigation_throttle.h"
-#include "brave/components/decentralized_dns/decentralized_dns_navigation_throttle.h"
+#include "brave/components/decentralized_dns/content/decentralized_dns_navigation_throttle.h"
 #include "brave/components/ftx/browser/buildflags/buildflags.h"
 #include "brave/components/gemini/browser/buildflags/buildflags.h"
 #include "brave/components/ipfs/buildflags/buildflags.h"

diff --git a/browser/brave_local_state_prefs.cc b/browser/brave_local_state_prefs.cc
@@ -16,7 +16,7 @@
 #include "brave/components/brave_shields/browser/brave_shields_p3a.h"
 #include "brave/components/brave_vpn/buildflags/buildflags.h"
 #include "brave/components/constants/pref_names.h"
-#include "brave/components/decentralized_dns/utils.h"
+#include "brave/components/decentralized_dns/core/utils.h"
 #include "brave/components/ntp_background_images/browser/ntp_background_images_service.h"
 #include "brave/components/ntp_background_images/browser/view_counter_service.h"
 #include "brave/components/p3a/brave_p3a_service.h"

diff --git a/browser/brave_wallet/BUILD.gn b/browser/brave_wallet/BUILD.gn
@@ -30,6 +30,7 @@ source_set("brave_wallet") {
     "//brave/components/brave_wallet/browser:constants",
     "//brave/components/brave_wallet/common",
     "//brave/components/brave_wallet/common:mojom",
+    "//chrome/browser:browser_process",
     "//chrome/browser/profiles:profiles",
     "//components/keyed_service/content",
     "//components/keyed_service/core",

diff --git a/browser/brave_wallet/json_rpc_service_factory.cc b/browser/brave_wallet/json_rpc_service_factory.cc
@@ -10,6 +10,7 @@
 #include "brave/browser/brave_wallet/brave_wallet_context_utils.h"
 #include "brave/components/brave_wallet/browser/brave_wallet_constants.h"
 #include "brave/components/brave_wallet/browser/json_rpc_service.h"
+#include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/user_prefs/user_prefs.h"
@@ -68,7 +69,8 @@ KeyedService* JsonRpcServiceFactory::BuildServiceInstanceFor(
   auto shared_url_loader_factory =
       default_storage_partition->GetURLLoaderFactoryForBrowserProcess();
   return new JsonRpcService(shared_url_loader_factory,
-                            user_prefs::UserPrefs::Get(context));
+                            user_prefs::UserPrefs::Get(context),
+                            g_browser_process->local_state());
 }
 
 content::BrowserContext* JsonRpcServiceFactory::GetBrowserContextToUse(

diff --git a/browser/decentralized_dns/test/BUILD.gn b/browser/decentralized_dns/test/BUILD.gn
@@ -12,10 +12,11 @@ source_set("browser_tests") {
   if (!is_android) {
     defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
 
-    sources = [ "//brave/browser/decentralized_dns/test/decentralized_dns_navigation_throttle_browsertest.cc" ]
+    sources = [ "decentralized_dns_navigation_throttle_browsertest.cc" ]
     deps = [
       "//base/test:test_support",
-      "//brave/components/decentralized_dns",
+      "//brave/components/decentralized_dns/content",
+      "//brave/components/decentralized_dns/core",
       "//chrome/browser:browser_process",
       "//chrome/test:test_support",
       "//chrome/test:test_support_ui",
@@ -30,9 +31,9 @@ source_set("browser_tests") {
 source_set("unit_tests") {
   testonly = true
   sources = [
-    "//brave/browser/decentralized_dns/test/decentralized_dns_navigation_throttle_unittest.cc",
-    "//brave/browser/decentralized_dns/test/utils_unittest.cc",
     "//brave/browser/net/decentralized_dns_network_delegate_helper_unittest.cc",
+    "decentralized_dns_navigation_throttle_unittest.cc",
+    "utils_unittest.cc",
   ]
 
   deps = [
@@ -44,7 +45,8 @@ source_set("unit_tests") {
     "//brave/components/brave_wallet/browser:utils",
     "//brave/components/brave_wallet/browser/test:test_support",
     "//brave/components/brave_wallet/common:mojom",
-    "//brave/components/decentralized_dns",
+    "//brave/components/decentralized_dns/content",
+    "//brave/components/decentralized_dns/core",
     "//brave/components/tor/buildflags",
     "//chrome/test:test_support",
     "//components/prefs",

diff --git a/browser/decentralized_dns/test/decentralized_dns_navigation_throttle_browsertest.cc b/browser/decentralized_dns/test/decentralized_dns_navigation_throttle_browsertest.cc
@@ -4,9 +4,9 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "base/test/scoped_feature_list.h"
-#include "brave/components/decentralized_dns/constants.h"
-#include "brave/components/decentralized_dns/decentralized_dns_opt_in_page.h"
-#include "brave/components/decentralized_dns/pref_names.h"
+#include "brave/components/decentralized_dns/content/decentralized_dns_opt_in_page.h"
+#include "brave/components/decentralized_dns/core/constants.h"
+#include "brave/components/decentralized_dns/core/pref_names.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"

diff --git a/browser/decentralized_dns/test/decentralized_dns_navigation_throttle_unittest.cc b/browser/decentralized_dns/test/decentralized_dns_navigation_throttle_unittest.cc
@@ -3,7 +3,7 @@
  * 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 "brave/components/decentralized_dns/decentralized_dns_navigation_throttle.h"
+#include "brave/components/decentralized_dns/content/decentralized_dns_navigation_throttle.h"
 
 #include "base/memory/raw_ptr.h"
 #include "base/test/scoped_feature_list.h"

diff --git a/browser/decentralized_dns/test/utils_unittest.cc b/browser/decentralized_dns/test/utils_unittest.cc
@@ -3,11 +3,11 @@
  * 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 "brave/components/decentralized_dns/utils.h"
+#include "brave/components/decentralized_dns/core/utils.h"
 
 #include "base/test/task_environment.h"
-#include "brave/components/decentralized_dns/constants.h"
-#include "brave/components/decentralized_dns/pref_names.h"
+#include "brave/components/decentralized_dns/core/constants.h"
+#include "brave/components/decentralized_dns/core/pref_names.h"
 #include "chrome/test/base/scoped_testing_local_state.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "components/prefs/testing_pref_service.h"

diff --git a/browser/extensions/BUILD.gn b/browser/extensions/BUILD.gn
@@ -74,7 +74,7 @@ source_set("extensions") {
     "//brave/components/brave_wayback_machine:buildflags",
     "//brave/components/constants",
     "//brave/components/de_amp/common",
-    "//brave/components/decentralized_dns",
+    "//brave/components/decentralized_dns/content",
     "//brave/components/ipfs/buildflags",
     "//brave/components/ntp_widget_utils/browser",
     "//brave/components/sidebar/buildflags",

diff --git a/browser/extensions/api/settings_private/brave_prefs_util.cc b/browser/extensions/api/settings_private/brave_prefs_util.cc
@@ -16,7 +16,7 @@
 #include "brave/components/constants/pref_names.h"
 #include "brave/components/crypto_dot_com/browser/buildflags/buildflags.h"
 #include "brave/components/de_amp/common/pref_names.h"
-#include "brave/components/decentralized_dns/pref_names.h"
+#include "brave/components/decentralized_dns/core/pref_names.h"
 #include "brave/components/ftx/browser/buildflags/buildflags.h"
 #include "brave/components/ipfs/buildflags/buildflags.h"
 #include "brave/components/ntp_background_images/common/pref_names.h"
@@ -319,6 +319,8 @@ const PrefsUtil::TypedPrefMap& BravePrefsUtil::GetAllowlistedKeys() {
       settings_api::PrefType::PREF_TYPE_NUMBER;
   (*s_brave_allowlist)[decentralized_dns::kENSResolveMethod] =
       settings_api::PrefType::PREF_TYPE_NUMBER;
+  (*s_brave_allowlist)[decentralized_dns::kEnsOffchainResolveMethod] =
+      settings_api::PrefType::PREF_TYPE_NUMBER;
 
   // Media router pref
   (*s_brave_allowlist)[kEnableMediaRouterOnRestart] =

diff --git a/browser/ipfs/content_browser_client_helper.cc b/browser/ipfs/content_browser_client_helper.cc
@@ -13,7 +13,7 @@
 #include "brave/browser/profiles/profile_util.h"
 #include "brave/components/constants/url_constants.h"
 #include "brave/components/constants/webui_url_constants.h"
-#include "brave/components/decentralized_dns/utils.h"
+#include "brave/components/decentralized_dns/core/utils.h"
 #include "brave/components/ipfs/ipfs_constants.h"
 #include "brave/components/ipfs/ipfs_utils.h"
 #include "brave/components/ipfs/pref_names.h"

diff --git a/browser/ipfs/content_browser_client_helper_unittest.cc b/browser/ipfs/content_browser_client_helper_unittest.cc
@@ -13,9 +13,9 @@
 #include "base/test/bind.h"
 #include "base/test/scoped_feature_list.h"
 #include "brave/components/constants/webui_url_constants.h"
-#include "brave/components/decentralized_dns/constants.h"
-#include "brave/components/decentralized_dns/pref_names.h"
-#include "brave/components/decentralized_dns/utils.h"
+#include "brave/components/decentralized_dns/core/constants.h"
+#include "brave/components/decentralized_dns/core/pref_names.h"
+#include "brave/components/decentralized_dns/core/utils.h"
 #include "brave/components/ipfs/features.h"
 #include "brave/components/ipfs/ipfs_constants.h"
 #include "brave/components/ipfs/ipfs_ports.h"

diff --git a/browser/ipfs/test/BUILD.gn b/browser/ipfs/test/BUILD.gn
@@ -25,7 +25,8 @@ source_set("unittests") {
     "//brave/browser/net",
     "//brave/browser/tor",
     "//brave/common",
-    "//brave/components/decentralized_dns",
+    "//brave/components/decentralized_dns/content",
+    "//brave/components/decentralized_dns/core",
     "//brave/components/ipfs",
     "//brave/components/tor/buildflags",
     "//chrome/common:channel_info",

diff --git a/browser/net/BUILD.gn b/browser/net/BUILD.gn
@@ -72,7 +72,7 @@ source_set("net") {
     "//brave/components/brave_wallet/browser",
     "//brave/components/brave_wallet/common",
     "//brave/components/brave_webtorrent/browser/buildflags",
-    "//brave/components/decentralized_dns",
+    "//brave/components/decentralized_dns/content",
     "//brave/components/ipfs/buildflags",
     "//brave/components/update_client:buildflags",
     "//brave/extensions:common",

diff --git a/browser/net/decentralized_dns_network_delegate_helper.cc b/browser/net/decentralized_dns_network_delegate_helper.cc
@@ -11,8 +11,8 @@
 #include "brave/browser/brave_wallet/json_rpc_service_factory.h"
 #include "brave/components/brave_wallet/browser/json_rpc_service.h"
 #include "brave/components/brave_wallet/common/brave_wallet.mojom.h"
-#include "brave/components/decentralized_dns/constants.h"
-#include "brave/components/decentralized_dns/utils.h"
+#include "brave/components/decentralized_dns/core/constants.h"
+#include "brave/components/decentralized_dns/core/utils.h"
 #include "brave/components/ipfs/ipfs_utils.h"
 #include "chrome/browser/browser_process.h"
 #include "content/public/browser/browser_context.h"
@@ -62,8 +62,12 @@ void OnBeforeURLRequest_EnsRedirectWork(
     const brave::ResponseCallback& next_callback,
     std::shared_ptr<brave::BraveRequestInfo> ctx,
     const std::vector<uint8_t>& content_hash,
+    bool require_offchain_consent,
     brave_wallet::mojom::ProviderError error,
     const std::string& error_message) {
+  // TODO(apaymyshev): implement interstitial page.
+  DCHECK(!require_offchain_consent);
+
   if (error != brave_wallet::mojom::ProviderError::kSuccess) {
     if (!next_callback.is_null())
       next_callback.Run();

diff --git a/browser/net/decentralized_dns_network_delegate_helper.h b/browser/net/decentralized_dns_network_delegate_helper.h
@@ -33,6 +33,7 @@ void OnBeforeURLRequest_EnsRedirectWork(
     const brave::ResponseCallback& next_callback,
     std::shared_ptr<brave::BraveRequestInfo> ctx,
     const std::vector<uint8_t>& content_hash,
+    bool require_offchain_consent,
     brave_wallet::mojom::ProviderError error,
     const std::string& error_message);
 

diff --git a/browser/net/decentralized_dns_network_delegate_helper_unittest.cc b/browser/net/decentralized_dns_network_delegate_helper_unittest.cc
@@ -17,9 +17,9 @@
 #include "brave/components/brave_wallet/common/brave_wallet.mojom.h"
 #include "brave/components/brave_wallet/common/eth_abi_utils.h"
 #include "brave/components/brave_wallet/common/hex_utils.h"
-#include "brave/components/decentralized_dns/constants.h"
-#include "brave/components/decentralized_dns/pref_names.h"
-#include "brave/components/decentralized_dns/utils.h"
+#include "brave/components/decentralized_dns/core/constants.h"
+#include "brave/components/decentralized_dns/core/pref_names.h"
+#include "brave/components/decentralized_dns/core/utils.h"
 #include "chrome/test/base/scoped_testing_local_state.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
@@ -241,12 +241,12 @@ TEST_F(DecentralizedDnsNetworkDelegateHelperTest, EnsRedirectWork) {
 
   // No redirect for failed requests.
   OnBeforeURLRequest_EnsRedirectWork(
-      ResponseCallback(), brave_request_info, {},
+      ResponseCallback(), brave_request_info, {}, false,
       brave_wallet::mojom::ProviderError::kInternalError, "todo");
   EXPECT_TRUE(brave_request_info->new_url_spec.empty());
 
   OnBeforeURLRequest_EnsRedirectWork(
-      ResponseCallback(), brave_request_info, {},
+      ResponseCallback(), brave_request_info, {}, false,
       brave_wallet::mojom::ProviderError::kSuccess, "");
   EXPECT_TRUE(brave_request_info->new_url_spec.empty());
 
@@ -260,7 +260,7 @@ TEST_F(DecentralizedDnsNetworkDelegateHelperTest, EnsRedirectWork) {
   auto content_hash = *brave_wallet::eth_abi::ExtractBytesFromTuple(
       *brave_wallet::PrefixedHexStringToBytes(content_hash_encoded_string), 0);
   OnBeforeURLRequest_EnsRedirectWork(
-      ResponseCallback(), brave_request_info, content_hash,
+      ResponseCallback(), brave_request_info, content_hash, false,
       brave_wallet::mojom::ProviderError::kSuccess, "");
   EXPECT_TRUE(brave_request_info->new_url_spec.empty());
 
@@ -274,7 +274,7 @@ TEST_F(DecentralizedDnsNetworkDelegateHelperTest, EnsRedirectWork) {
   content_hash = *brave_wallet::eth_abi::ExtractBytesFromTuple(
       *brave_wallet::PrefixedHexStringToBytes(content_hash_encoded_string), 0);
   OnBeforeURLRequest_EnsRedirectWork(
-      ResponseCallback(), brave_request_info, content_hash,
+      ResponseCallback(), brave_request_info, content_hash, false,
       brave_wallet::mojom::ProviderError::kSuccess, "");
   EXPECT_EQ(brave_request_info->new_url_spec,
             "ipfs://"

diff --git a/browser/resources/settings/BUILD.gn b/browser/resources/settings/BUILD.gn
@@ -147,7 +147,7 @@ preprocess_if_expr("preprocess_generated") {
     "brave_ipfs_page/ipfs_peers_subpage.m.js",
     "brave_ipfs_page/add_ipfs_peer_dialog.js",
     "brave_default_extensions_page/brave_default_extensions_browser_proxy.m.js",
-    "brave_default_extensions_page/brave_default_extensions_page.m.js",
+    "brave_default_extensions_page/brave_default_extensions_page.js",
     "brave_help_tips_page/brave_help_tips_page.js",
     "brave_icons.m.js",
     "brave_new_tab_page/brave_new_tab_browser_proxy.m.js",

diff --git a/browser/resources/settings/brave_default_extensions_page/BUILD.gn b/browser/resources/settings/brave_default_extensions_page/BUILD.gn
@@ -12,20 +12,16 @@ import("../settings.gni")
 
 group("web_modules") {
   public_deps = [
-    ":brave_default_extensions_page_module",
     ":modules",
+    ":templatize",
   ]
 }
 
-polymer_modulizer("brave_default_extensions_page") {
-  js_file = "brave_default_extensions_page.js"
-  html_file = "brave_default_extensions_page.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports + [ "brave/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_browser_proxy.html|BraveDefaultExtensionsBrowserProxy, BraveDefaultExtensionsBrowserProxyImpl" ]
-  namespace_rewrites = settings_namespace_rewrites
-}
-
 js_modulizer("modules") {
   input_files = [ "brave_default_extensions_browser_proxy.js" ]
   namespace_rewrites = settings_namespace_rewrites
 }
+
+html_to_js("templatize") {
+  js_files = [ "brave_default_extensions_page.js" ]
+}