Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix shield availability on ipfs pages

Browse Source
This commit is contained in:
sergey
2021-03-02 16:17:57 +03:00
parent 43ab1ab959
commit 65a76ed077
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
browser/net/url_context.cc
+16 -15
View File
@@ -119,6 +119,22 @@ std::shared_ptr<brave::BraveRequestInfo> BraveRequestInfo::MakeCTX(
ctx->redirect_source = old_ctx->redirect_source;
}
#if BUILDFLAG(IPFS_ENABLED)
auto* prefs = user_prefs::UserPrefs::Get(browser_context);
ctx->ipfs_gateway_url =
ipfs::GetConfiguredBaseGateway(browser_context, chrome::GetChannel());
ctx->ipfs_auto_fallback = prefs->GetBoolean(kIPFSAutoRedirectGateway);
// ipfs:// navigations have no tab origin set, but we want it to be the tab
// origin of the gateway so that ad-block in particular won't give up early.
if (ipfs::IsLocalGatewayConfigured(browser_context) &&
ctx->tab_origin.is_empty() &&
ipfs::IsLocalGatewayURL(ctx->initiator_url)) {
ctx->tab_url = ctx->initiator_url;
ctx->tab_origin = ctx->initiator_url.GetOrigin();
}
#endif
Profile* profile = Profile::FromBrowserContext(browser_context);
auto* map = HostContentSettingsMapFactory::GetForProfile(profile);
ctx->allow_brave_shields =
@@ -138,21 +154,6 @@ std::shared_ptr<brave::BraveRequestInfo> BraveRequestInfo::MakeCTX(
ctx->upload_data = GetUploadData(request);
ctx->browser_context = browser_context;
#if BUILDFLAG(IPFS_ENABLED)
auto* prefs = user_prefs::UserPrefs::Get(browser_context);
ctx->ipfs_gateway_url =
ipfs::GetConfiguredBaseGateway(browser_context, chrome::GetChannel());
ctx->ipfs_auto_fallback = prefs->GetBoolean(kIPFSAutoRedirectGateway);
// ipfs:// navigations have no tab origin set, but we want it to be the tab
// origin of the gateway so that ad-block in particular won't give up early.
if (ipfs::IsLocalGatewayConfigured(browser_context) &&
ctx->tab_origin.is_empty() &&
ipfs::IsLocalGatewayURL(ctx->initiator_url)) {
ctx->tab_url = ctx->initiator_url;
ctx->tab_origin = ctx->initiator_url.GetOrigin();
}
#endif
// TODO(fmarier): remove this once the hacky code in
// brave_proxying_url_loader_factory.cc is refactored. See