Skip to content

Specify resolver source to avoid using system resolver for CNAME adblocking (uplift to 1.20.x) #8010

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 19, 2021
Merged

Specify resolver source to avoid using system resolver for CNAME adblocking (uplift to 1.20.x) #8010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17a1316
Merge pull request #7731 from brave/doh-leak
darkdh Jan 28, 2021
da2fa9e
Merge pull request #7909 from brave/pr7769_tor-dns-leak_1.21.x
kjozwiak Feb 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions browser/net/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ source_set("net") {
"//brave/components/brave_webtorrent/browser/buildflags",
"//brave/components/ipfs/buildflags",
"//brave/extensions:common",
"//components/content_settings/core/browser",
"//components/prefs",
"//components/user_prefs",
"//content/public/browser",
"//content/public/common",
"//components/content_settings/core/browser",
"//extensions/common:common_constants",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/system",
Expand Down Expand Up @@ -88,9 +88,7 @@ source_set("net") {
"brave_referrals_network_delegate_helper.h",
]

deps += [
"//brave/components/brave_referrals/browser",
]
deps += [ "//brave/components/brave_referrals/browser" ]
}

if (enable_brave_webtorrent) {
Expand Down
15 changes: 14 additions & 1 deletion browser/net/brave_ad_block_tp_network_delegate_helper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,10 @@ class AdblockCnameResolveHostClient : public network::mojom::ResolveHostClient {
network::mojom::ResolveHostParametersPtr optional_parameters =
network::mojom::ResolveHostParameters::New();
optional_parameters->include_canonical_name = true;
// Explicitly specify source to avoid using `HostResolverProc`
// which will be handled by system resolver
// See https://crbug.com/872665
optional_parameters->source = net::HostResolverSource::DNS;

network::mojom::NetworkContext* network_context =
content::BrowserContext::GetDefaultStoragePartition(context)
Expand Down Expand Up @@ -192,7 +196,16 @@ void OnBeforeURLRequestAdBlockTP(const ResponseCallback& next_callback,
scoped_refptr<base::SequencedTaskRunner> task_runner =
g_brave_browser_process->ad_block_service()->GetTaskRunner();

new AdblockCnameResolveHostClient(std::move(next_callback), task_runner, ctx);
DCHECK(ctx->browser_context);
// DoH or standard DNS quries won't be routed through Tor, so we need to skip
// it.
if (ctx->browser_context->IsTor()) {
ShouldBlockAdWithOptionalCname(task_runner, std::move(next_callback), ctx,
base::nullopt);
} else {
new AdblockCnameResolveHostClient(std::move(next_callback), task_runner,
ctx);
}
}

int OnBeforeURLRequest_AdBlockTPPreWork(const ResponseCallback& next_callback,
Expand Down