WIP: Fix referrer handling of redirected navigations (fixes brave/bra…

…ve-browser#7933) This appears to be in the wrong hook. It's not clear it's even needed.
fmarier · Sep 19, 2020 · aae6562 · aae6562
1 parent 0a6800d
commit aae6562
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/browser/brave_content_browser_client.cc b/browser/brave_content_browser_client.cc
@@ -383,7 +383,7 @@ void BraveContentBrowserClient::MaybeHideReferrer(
   content::Referrer new_referrer;
   if (brave_shields::MaybeChangeReferrer(
       allow_referrers, shields_up, (*referrer)->url, document_url, request_url,
-      policy,
+      GURL() /* redirect_source */, policy,  // TODO: pass the right redirect_source
       &new_referrer)) {
     (*referrer)->url = new_referrer.url;
     (*referrer)->policy = new_referrer.policy;

diff --git a/browser/net/brave_site_hacks_network_delegate_helper.cc b/browser/net/brave_site_hacks_network_delegate_helper.cc
@@ -137,6 +137,7 @@ bool ApplyPotentialReferrerBlock(std::shared_ptr<BraveRequestInfo> ctx) {
   if (brave_shields::MaybeChangeReferrer(
           ctx->allow_referrers, ctx->allow_brave_shields, GURL(ctx->referrer),
           ctx->tab_origin, ctx->request_url,
+          ctx->internal_redirect ? GURL() : ctx->redirect_source,
           blink::ReferrerUtils::NetToMojoReferrerPolicy(ctx->referrer_policy),
           &new_referrer)) {
     ctx->new_referrer = new_referrer.url;

diff --git a/components/brave_shields/browser/brave_shields_util.cc b/components/brave_shields/browser/brave_shields_util.cc
@@ -438,6 +438,7 @@ bool MaybeChangeReferrer(
     const GURL& current_referrer,
     const GURL& tab_origin,
     const GURL& target_url,
+    const GURL& redirect_source,
     network::mojom::ReferrerPolicy policy,
     Referrer* output_referrer) {
   DCHECK(output_referrer);
@@ -448,6 +449,11 @@ bool MaybeChangeReferrer(
   const url::Origin original_referrer = url::Origin::Create(current_referrer);
   const url::Origin target_origin = url::Origin::Create(target_url);
 
+  if (redirect_source.is_valid()) {
+    return !net::registry_controlled_domains::SameDomainOrHost(redirect_source, target_url,
+          net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES);
+  }
+
   if (original_referrer.IsSameOriginWith(target_origin)) {
     // Do nothing for same-origin requests. This check also prevents us from
     // sending referrer from HTTPS to HTTP.

diff --git a/components/brave_shields/browser/brave_shields_util.h b/components/brave_shields/browser/brave_shields_util.h
@@ -99,6 +99,7 @@ bool MaybeChangeReferrer(
     const GURL& current_referrer,
     const GURL& tab_origin,
     const GURL& target_url,
+    const GURL& redirect_source,
     network::mojom::ReferrerPolicy policy,
     content::Referrer* output_referrer);