Skip to content

Commit

Permalink
Merge pull request #8279 from brave/cname-adblock-doh
Browse files Browse the repository at this point in the history
Only specify net::HostResolverSource::DNS when DoH is enabled
  • Loading branch information
bbondy authored Mar 18, 2021
2 parents c655ede + 4537a79 commit 9694c14
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions browser/net/brave_ad_block_tp_network_delegate_helper.cc
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

0 comments on commit 9694c14

Please sign in to comment.