DoH-secure-mode-by-default.patch 1.8 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243
  1. From: csagan5 <32685696+csagan5@users.noreply.github.com>
  2. Date: Sat, 26 Sep 2020 14:23:19 +0100
  3. Subject: DoH secure mode by default
  4. ---
  5. .../browser/net/stub_resolver_config_reader.cc | 17 +----------------
  6. 1 file changed, 1 insertion(+), 16 deletions(-)
  7. diff --git a/chrome/browser/net/stub_resolver_config_reader.cc b/chrome/browser/net/stub_resolver_config_reader.cc
  8. --- a/chrome/browser/net/stub_resolver_config_reader.cc
  9. +++ b/chrome/browser/net/stub_resolver_config_reader.cc
  10. @@ -154,7 +154,7 @@ StubResolverConfigReader::StubResolverConfigReader(PrefService* local_state,
  11. if (entries.count("dns-over-https@1")) {
  12. // The user has "Enabled" selected.
  13. local_state_->SetString(prefs::kDnsOverHttpsMode,
  14. - SecureDnsConfig::kModeAutomatic);
  15. + SecureDnsConfig::kModeSecure);
  16. } else if (entries.count("dns-over-https@2")) {
  17. // The user has "Disabled" selected.
  18. local_state_->SetString(prefs::kDnsOverHttpsMode,
  19. @@ -334,22 +334,7 @@ SecureDnsConfig StubResolverConfigReader::GetAndUpdateConfiguration(
  20. check_parental_controls = false;
  21. }
  22. - // Check parental controls last because it can be expensive and should only be
  23. - // checked if necessary for the otherwise-determined mode.
  24. if (check_parental_controls) {
  25. - if (ShouldDisableDohForParentalControls()) {
  26. - forced_management_mode =
  27. - SecureDnsConfig::ManagementMode::kDisabledParentalControls;
  28. - secure_dns_mode = net::SecureDnsMode::kOff;
  29. - mode_details =
  30. - SecureDnsModeDetailsForHistogram::kOffByDetectedParentalControls;
  31. -
  32. - // If parental controls had not previously been checked, need to update
  33. - // network service.
  34. - if (!parental_controls_checked_)
  35. - update_network_service = true;
  36. - }
  37. -
  38. parental_controls_checked_ = true;
  39. }