review fixes

Author: spylogsster

chromium_src/net/base/lookup_string_in_fixed_set.cc

@@ -53,6 +53,10 @@ int LookupSuffixInReversedSet(const unsigned char* graph,
     *suffix_length = strlen(decentralized_dns::kEthDomain) - 1;
     return kDafsaFound;
   }
+  if (base::EndsWith(host, decentralized_dns::kDNSForEthDomain)) {
+    *suffix_length = strlen(decentralized_dns::kDNSForEthDomain) - 1;
+    return kDafsaFound;
+  }
 
   return LookupSuffixInReversedSet_ChromiumImpl(graph, length, include_private,
                                                 host, suffix_length);

components/brave_rewards/browser/rewards_service_impl.cc

@@ -651,18 +651,25 @@ void RewardsServiceImpl::OnLoad(SessionID tab_id, const GURL& url) {
     return;
   }
 
-  auto origin = url.GetOrigin();
-  const std::string baseDomain =
-      GetDomainAndRegistry(origin.host(), INCLUDE_PRIVATE_REGISTRIES);
-
+  auto origin = url.GetOrigin().host();
+  std::string baseDomain =
+      GetDomainAndRegistry(url.host(), INCLUDE_PRIVATE_REGISTRIES);
+#if BUILDFLAG(IPFS_ENABLED)
+  if (baseDomain.empty()) {
+    baseDomain = ipfs::GetRegistryDomainFromIPNS(url);
+    if (!baseDomain.empty()) {
+      origin = baseDomain;
+    }
+  }
+#endif
   if (baseDomain == "")
     return;
 
-  const std::string publisher_url = origin.scheme() + "://" + baseDomain + "/";
+  const std::string publisher_url = url.scheme() + "://" + baseDomain + "/";
 
   ledger::type::VisitDataPtr data = ledger::type::VisitData::New();
   data->tld = data->name = baseDomain;
-  data->domain = origin.host(),
+  data->domain = origin;
   data->path = url.path();
   data->tab_id = tab_id.id();
   data->url = publisher_url;
@@ -1767,20 +1774,16 @@ void RewardsServiceImpl::GetPublisherActivityFromUrl(
     return;
   }
 
-  auto origin = parsed_url.GetOrigin();
+  auto origin = parsed_url.GetOrigin().spec();
   std::string baseDomain =
-      GetDomainAndRegistry(origin.host(), INCLUDE_PRIVATE_REGISTRIES);
+      GetDomainAndRegistry(parsed_url.host(), INCLUDE_PRIVATE_REGISTRIES);
   std::string path = parsed_url.PathForRequest();
 #if BUILDFLAG(IPFS_ENABLED)
-  if (parsed_url.SchemeIs(ipfs::kIPNSScheme)) {
-    std::string cid;
-    if (!ipfs::GetRegistryDomainFromIPNS(parsed_url, &cid, &path))
-      return;
-    origin = GURL(parsed_url.scheme() + "://" + cid);
-    baseDomain = cid;
-  } else if (parsed_url.SchemeIs(ipfs::kIPFSScheme)) {
-    OnPanelPublisherInfo(ledger::type::Result::NOT_FOUND, nullptr, windowId);
-    return;
+  if (baseDomain.empty()) {
+    baseDomain = ipfs::GetRegistryDomainFromIPNS(parsed_url);
+    if (!baseDomain.empty()) {
+      origin = parsed_url.scheme() + "://" + baseDomain + "/";
+    }
   }
 #endif
   if (baseDomain == "") {
@@ -1799,7 +1802,7 @@ void RewardsServiceImpl::GetPublisherActivityFromUrl(
   ledger::type::VisitDataPtr visit_data = ledger::type::VisitData::New();
   visit_data->domain = visit_data->name = baseDomain;
   visit_data->path = path;
-  visit_data->url = origin.spec();
+  visit_data->url = origin;
   visit_data->favicon_url = favicon_url;
 
   bat_ledger_->GetPublisherActivityFromUrl(

components/ipfs/ipfs_utils.cc

@@ -389,25 +389,15 @@ GURL ContentHashToCIDv1URL(const std::string& contenthash) {
   return GURL(scheme + "://" + cidv1);
 }
 
-bool GetRegistryDomainFromIPNS(const GURL& url,
-                               std::string* domain,
-                               std::string* path) {
+std::string GetRegistryDomainFromIPNS(const GURL& url) {
   if (!url.SchemeIs(ipfs::kIPNSScheme))
-    return false;
-  DCHECK(domain);
-  DCHECK(path);
+    return std::string();
   std::string cid;
   std::string ipfs_path;
   if (!ipfs::ParseCIDAndPathFromIPFSUrl(url, &cid, &ipfs_path) || cid.empty())
-    return false;
-  if (GetDomainAndRegistry(
-          cid, net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES)
-          .empty()) {
-    return false;
-  }
-  *domain = cid;
-  *path = ipfs_path;
-  return !domain->empty();
+    return std::string();
+  return GetDomainAndRegistry(
+      cid, net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES);
 }
 
 }  // namespace ipfs

components/ipfs/ipfs_utils.h

@@ -61,9 +61,7 @@ bool ParsePeerConnectionString(const std::string& value,
 GURL ContentHashToCIDv1URL(const std::string& contenthash);
 bool IsAPIGateway(const GURL& url, version_info::Channel channel);
 bool IsIpfsResolveMethodDisabled(PrefService* prefs);
-bool GetRegistryDomainFromIPNS(const GURL& url,
-                               std::string* domain,
-                               std::string* path);
+std::string GetRegistryDomainFromIPNS(const GURL& url);
 }  // namespace ipfs
 
 #endif  // BRAVE_COMPONENTS_IPFS_IPFS_UTILS_H_

components/ipfs/ipfs_utils_unittest.cc

@@ -659,36 +659,16 @@ TEST_F(IpfsUtilsUnitTest, IsAPIGatewayTest) {
 }
 
 TEST_F(IpfsUtilsUnitTest, IPNSRegistryDomain) {
-  std::string cid;
-  std::string path;
-  ASSERT_FALSE(
-      ipfs::GetRegistryDomainFromIPNS(GURL("ipfs://bafy"), &cid, &path));
-  EXPECT_TRUE(cid.empty());
-  EXPECT_TRUE(path.empty());
-
-  ASSERT_FALSE(
-      ipfs::GetRegistryDomainFromIPNS(GURL("ipfs://QmfdSDf"), &cid, &path));
-  EXPECT_TRUE(cid.empty());
-  EXPECT_TRUE(path.empty());
-
-  ASSERT_FALSE(
-      ipfs::GetRegistryDomainFromIPNS(GURL("ipns://QmfdSDf"), &cid, &path));
-  EXPECT_TRUE(cid.empty());
-  EXPECT_TRUE(path.empty());
-
-  ASSERT_FALSE(
-      ipfs::GetRegistryDomainFromIPNS(GURL("ipns://bafyff"), &cid, &path));
-  EXPECT_TRUE(cid.empty());
-  EXPECT_TRUE(path.empty());
-
-  ASSERT_TRUE(ipfs::GetRegistryDomainFromIPNS(GURL("ipns://brantly.eth.link"),
-                                              &cid, &path));
-  EXPECT_EQ(cid, "brantly.eth.link");
-  EXPECT_TRUE(path.empty());
-
-  cid.clear();
-  ASSERT_TRUE(ipfs::GetRegistryDomainFromIPNS(GURL("ipns://brantly.eth/path"),
-                                              &cid, &path));
-  EXPECT_EQ(cid, "brantly.eth");
-  EXPECT_EQ(path, "/path");
+  EXPECT_EQ(ipfs::GetRegistryDomainFromIPNS(GURL("http://google.com")), "");
+  EXPECT_EQ(ipfs::GetRegistryDomainFromIPNS(GURL("https://google.com")), "");
+  EXPECT_EQ(ipfs::GetRegistryDomainFromIPNS(GURL("ipfs://bafy")), "");
+  EXPECT_EQ(ipfs::GetRegistryDomainFromIPNS(GURL("ipfs://QmfdSDf")), "");
+  EXPECT_EQ(ipfs::GetRegistryDomainFromIPNS(GURL("ipns://QmfdSDf/path")), "");
+  EXPECT_EQ(ipfs::GetRegistryDomainFromIPNS(GURL("ipns://bafyff/path")), "");
+  EXPECT_EQ(ipfs::GetRegistryDomainFromIPNS(GURL("ipns://brantly.eth.link")),
+            "brantly.eth.link");
+  EXPECT_EQ(ipfs::GetRegistryDomainFromIPNS(GURL("ipns://brantly.eth/path")),
+            "brantly.eth");
+  EXPECT_EQ(ipfs::GetRegistryDomainFromIPNS(GURL("ipns://blah.google.com")),
+            "google.com");
 }

net/decentralized_dns/constants.h

@@ -13,6 +13,7 @@ constexpr char kUnstoppableDomainsDoHResolver[] =
     "https://resolver.unstoppable.io/dns-query{?brave_UD}";
 
 constexpr char kEthDomain[] = ".eth";
+constexpr char kDNSForEthDomain[] = ".eth.link";
 constexpr char kENSDoHResolver[] =
     "https://resolver.cloudflare-eth.com/dns-query{?brave_ENS}";