Skip to content
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

Only specify net::HostResolverSource::DNS when DoH is enabled #8279

Merged
merged 1 commit into from
Mar 18, 2021
Merged

Only specify net::HostResolverSource::DNS when DoH is enabled #8279

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 10 additions & 3 deletions 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 @@ -23,6 +23,8 @@
#include "brave/components/brave_shields/common/brave_shield_constants.h"
#include "brave/components/brave_shields/common/features.h"
#include "brave/grit/brave_generated_resources.h"
#include "chrome/browser/net/secure_dns_config.h"
#include "chrome/browser/net/system_network_context_manager.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/render_frame_host.h"
Expand Down Expand Up @@ -144,10 +146,15 @@ 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

SecureDnsConfig secure_dns_config =
SystemNetworkContextManager::GetStubResolverConfigReader()
->GetSecureDnsConfiguration(false);
// Explicitly specify source when DNS over HTTPS is enabled to avoid
// using `HostResolverProc` which will be handled by system resolver
// See https://crbug.com/872665
optional_parameters->source = net::HostResolverSource::DNS;
if (secure_dns_config.mode() == net::SecureDnsMode::kSecure)
optional_parameters->source = net::HostResolverSource::DNS;

network::mojom::NetworkContext* network_context =
content::BrowserContext::GetDefaultStoragePartition(context)
Expand Down