Uplift of #9355 (squashed) to beta

brave · Jul 12, 2021 · 281f580 · 281f580
1 parent 65807fd
commit 281f580
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/browser/net/ipfs_redirect_network_delegate_helper.cc b/browser/net/ipfs_redirect_network_delegate_helper.cc
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "brave/browser/profiles/profile_util.h"
 #include "brave/components/ipfs/ipfs_utils.h"
 #include "chrome/common/channel_info.h"
 #include "components/prefs/pref_service.h"
@@ -19,7 +20,7 @@ namespace ipfs {
 int OnBeforeURLRequest_IPFSRedirectWork(
     const brave::ResponseCallback& next_callback,
     std::shared_ptr<brave::BraveRequestInfo> ctx) {
-  if (!ctx->browser_context)
+  if (!ctx->browser_context || !brave::IsRegularProfile(ctx->browser_context))
     return net::OK;
   auto* prefs = user_prefs::UserPrefs::Get(ctx->browser_context);
   if (IsIpfsResolveMethodDisabled(prefs)) {

diff --git a/browser/net/ipfs_redirect_network_delegate_helper_unittest.cc b/browser/net/ipfs_redirect_network_delegate_helper_unittest.cc
@@ -204,4 +204,17 @@ TEST_F(IPFSRedirectNetworkDelegateHelperTest, HeadersIPFSWorkNoRedirect) {
   EXPECT_TRUE(allowed_unsafe_redirect_url.is_empty());
 }
 
+TEST_F(IPFSRedirectNetworkDelegateHelperTest, PrivateProfile) {
+  GURL url("ipfs://QmfM2r8seH2GiRaC4esTjeraXEachRt8ZsSeGaWTPLyMoG");
+  auto brave_request_info = std::make_shared<brave::BraveRequestInfo>(url);
+  brave_request_info->browser_context = profile()->GetPrimaryOTRProfile(true);
+  brave_request_info->ipfs_gateway_url = GetPublicGateway();
+  brave_request_info->initiator_url = ipfs::GetIPFSGatewayURL(
+      initiator_cid, "", ipfs::GetDefaultIPFSGateway(profile()->GetPrefs()));
+  int rc = ipfs::OnBeforeURLRequest_IPFSRedirectWork(brave::ResponseCallback(),
+                                                     brave_request_info);
+  EXPECT_EQ(rc, net::OK);
+  EXPECT_TRUE(brave_request_info->new_url_spec.empty());
+}
+
 }  // namespace ipfs