Merge pull request #754 from brave/fix_referrer_and_httpse

Allow redirecting to the same URL when referrer is overwritten
brave · Oct 28, 2018 · 84dee7f · 84dee7f
1 parent a7e7cf8
commit 84dee7f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/browser/net/brave_network_delegate_base.cc b/browser/net/brave_network_delegate_base.cc
@@ -180,7 +180,8 @@ void BraveNetworkDelegateBase::RunNextCallback(
 
   if (ctx->event_type == brave::kOnBeforeRequest) {
     if (!ctx->new_url_spec.empty() &&
-        ctx->new_url_spec != ctx->request_url.spec() &&
+        (ctx->new_url_spec != ctx->request_url.spec() ||
+          ctx->referrer_changed) &&
         IsRequestIdentifierValid(ctx->request_identifier)) {
       *ctx->new_url = GURL(ctx->new_url_spec);
     }

diff --git a/browser/net/brave_site_hacks_network_delegate_helper.cc b/browser/net/brave_site_hacks_network_delegate_helper.cc
@@ -54,8 +54,10 @@ int OnBeforeURLRequest_SiteHacksWork(
     const ResponseCallback& next_callback,
     std::shared_ptr<BraveRequestInfo> ctx) {
 
-  if (ApplyPotentialReferrerBlock(ctx->request))
+  if (ApplyPotentialReferrerBlock(ctx->request)) {
     ctx->new_url_spec = ctx->request_url.spec();
+    ctx->referrer_changed = true;
+  }
 
   return net::OK;
 }

diff --git a/browser/net/url_context.h b/browser/net/url_context.h
@@ -53,6 +53,7 @@ struct BraveRequestInfo {
   bool allow_brave_shields = true;
   bool allow_ads = false;
   bool allow_http_upgradable_resource = false;
+  bool referrer_changed = false;
   int render_process_id = 0;
   int render_frame_id = 0;
   int frame_tree_node_id = 0;