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

Merge pull request #8336 from brave/devtools_no_adblock

Browse Source 
Prevent devtools requests from getting intercepted by adblock
This commit is contained in:
Brian Clifton
2021-03-23 16:43:02 -07:00
committed by GitHub
parent e7c81af3d3 24fdf3cb4f
commit cb524b0f4e
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
browser/net/brave_ad_block_tp_network_delegate_helper.cc
+5 -3
View File
@@ -30,6 +30,7 @@
#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/storage_partition.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/url_constants.h"
#include "extensions/common/url_pattern.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "services/network/network_context.h"
@@ -226,9 +227,10 @@ int OnBeforeURLRequest_AdBlockTPPreWork(const ResponseCallback& next_callback,
std::shared_ptr<BraveRequestInfo> ctx) {
// If the following info isn't available, then proper content settings can't
// be looked up, so do nothing.
if (ctx->request_url.is_empty() || ctx->initiator_url.is_empty() ||
!ctx->initiator_url.has_host() || !ctx->allow_brave_shields ||
ctx->allow_ads ||
if (ctx->request_url.is_empty() ||
ctx->request_url.SchemeIs(content::kChromeDevToolsScheme) ||
ctx->initiator_url.is_empty() || !ctx->initiator_url.has_host() ||
!ctx->allow_brave_shields || ctx->allow_ads ||
ctx->resource_type == BraveRequestInfo::kInvalidResourceType) {
return net::OK;
}
browser/net/brave_ad_block_tp_network_delegate_helper_unittest.cc
+11
View File
@@ -32,3 +32,14 @@ TEST(BraveAdBlockTPNetworkDelegateHelperTest, EmptyRequestURL) {
EXPECT_TRUE(request_info->new_url_spec.empty());
EXPECT_EQ(rc, net::OK);
}
TEST(BraveAdBlockTPNetworkDelegateHelperTest, DevToolURL) {
const GURL url("devtools://devtools/");
auto request_info = std::make_shared<brave::BraveRequestInfo>(url);
request_info->initiator_url =
GURL("devtools://devtools/bundled/root/root.js");
int rc =
OnBeforeURLRequest_AdBlockTPPreWork(ResponseCallback(), request_info);
EXPECT_TRUE(request_info->new_url_spec.empty());
EXPECT_EQ(rc, net::OK);
}