From 5ef02952f21c9d538ebdef5782be025f912a3c4f Mon Sep 17 00:00:00 2001 From: Root <175176948+RKNF404@users.noreply.github.com> Date: Fri, 21 Feb 2025 01:29:42 -0500 Subject: [PATCH 1/6] chore: adjust preset dns providers --- patches/dns-providers.patch | 167 ++++++++++++++++++++++++++++++++++++ 1 file changed, 167 insertions(+) create mode 100644 patches/dns-providers.patch diff --git a/patches/dns-providers.patch b/patches/dns-providers.patch new file mode 100644 index 00000000..4aef81b3 --- /dev/null +++ b/patches/dns-providers.patch @@ -0,0 +1,167 @@ +diff --git a/net/dns/public/doh_provider_entry.cc b/net/dns/public/doh_provider_entry.cc +index 910a0c91aa1fa..4478396cdbe35 100644 +--- a/net/dns/public/doh_provider_entry.cc ++++ b/net/dns/public/doh_provider_entry.cc +@@ -77,7 +77,7 @@ const DohProviderEntry::List& DohProviderEntry::GetList() { + /*ui_name=*/"alekberg.net (NL)", + /*privacy_policy=*/"https://alekberg.net/privacy", + /*display_globally=*/false, +- /*display_countries=*/{"NL"}, LoggingLevel::kNormal}, ++ /*display_countries=*/{}, LoggingLevel::kNormal}, + {"CleanBrowsingAdult", + MAKE_BASE_FEATURE_WITH_STATIC_STORAGE(DohProviderCleanBrowsingAdult, + base::FEATURE_ENABLED_BY_DEFAULT), +@@ -99,7 +99,7 @@ const DohProviderEntry::List& DohProviderEntry::GetList() { + "https://doh.cleanbrowsing.org/doh/family-filter{?dns}", + /*ui_name=*/"CleanBrowsing (Family Filter)", + /*privacy_policy=*/"https://cleanbrowsing.org/privacy", +- /*display_globally=*/true, ++ /*display_globally=*/false, + /*display_countries=*/{}, + LoggingLevel::kNormal}, + {"CleanBrowsingSecure", +@@ -117,15 +117,105 @@ const DohProviderEntry::List& DohProviderEntry::GetList() { + MAKE_BASE_FEATURE_WITH_STATIC_STORAGE(DohProviderCloudflare, + base::FEATURE_ENABLED_BY_DEFAULT), + {"1.1.1.1", "1.0.0.1", "2606:4700:4700::1111", "2606:4700:4700::1001"}, +- /*dns_over_tls_hostnames=*/ +- {"one.one.one.one", "1dot1dot1dot1.cloudflare-dns.com"}, +- "https://chrome.cloudflare-dns.com/dns-query", ++ /*dns_over_tls_hostnames=*/{"one.one.one.one", "cloudflare-dns.com", ++ "1dot1dot1dot1.cloudflare-dns.com"}, ++ "https://cloudflare-dns.com/dns-query", + /*ui_name=*/"Cloudflare (1.1.1.1)", + "https://developers.cloudflare.com/1.1.1.1/privacy/" + /*privacy_policy=*/"public-dns-resolver/", + /*display_globally=*/true, + /*display_countries=*/{}, + LoggingLevel::kExtra}, ++ {"CloudflareSecurity", ++ MAKE_BASE_FEATURE_WITH_STATIC_STORAGE(DohProviderCloudflareSecurity, ++ base::FEATURE_ENABLED_BY_DEFAULT), ++ {"1.1.1.2", "1.0.0.2", "2606:4700:4700::1112", "2606:4700:4700::1002"}, ++ /*dns_over_tls_hostnames=*/{"security.cloudflare-dns.com"}, ++ "https://security.cloudflare-dns.com/dns-query", ++ /*ui_name=*/"Cloudflare (Malware Filter)", ++ "https://developers.cloudflare.com/1.1.1.1/privacy/" ++ /*privacy_policy=*/"public-dns-resolver/", ++ /*display_globally=*/true, ++ /*display_countries=*/{}, ++ LoggingLevel::kExtra}, ++ {"CloudflareFamily", ++ MAKE_BASE_FEATURE_WITH_STATIC_STORAGE(DohProviderCloudflareFamily, ++ base::FEATURE_ENABLED_BY_DEFAULT), ++ {"1.1.1.3", "1.0.0.3", "2606:4700:4700::1113", "2606:4700:4700::1003"}, ++ /*dns_over_tls_hostnames=*/{"family.cloudflare-dns.com"}, ++ "https://family.cloudflare-dns.com/dns-query", ++ /*ui_name=*/"Cloudflare (Family Filter)", ++ "https://developers.cloudflare.com/1.1.1.1/privacy/" ++ /*privacy_policy=*/"public-dns-resolver/", ++ /*display_globally=*/true, ++ /*display_countries=*/{}, ++ LoggingLevel::kExtra}, ++ {"ControlD", ++ MAKE_BASE_FEATURE_WITH_STATIC_STORAGE(DohProviderControlD, ++ base::FEATURE_ENABLED_BY_DEFAULT), ++ {"76.76.2.0", "76.76.10.0", "2606:1a40::", "2606:1a40:1::"}, ++ /*dns_over_tls_hostnames=*/{"p0.freedns.controld.com"}, ++ "https://freedns.controld.com/p0", ++ /*ui_name=*/"", ++ /*privacy_policy=*/"", ++ /*display_globally=*/false, ++ /*display_countries=*/{}, ++ LoggingLevel::kExtra}, ++ {"ControlDMalware", ++ MAKE_BASE_FEATURE_WITH_STATIC_STORAGE(DohProviderControlDMalware, ++ base::FEATURE_ENABLED_BY_DEFAULT), ++ {"76.76.2.1", "76.76.10.1", "2606:1a40::1", "2606:1a40:1::1"}, ++ /*dns_over_tls_hostnames=*/{"p1.freedns.controld.com"}, ++ "https://freedns.controld.com/p1", ++ /*ui_name=*/"Control D (Malware Filtering)", ++ /*privacy_policy=*/"https://controld.com/privacy", ++ /*display_globally=*/true, ++ /*display_countries=*/{}, ++ LoggingLevel::kExtra}, ++ {"ControlDStandard", ++ MAKE_BASE_FEATURE_WITH_STATIC_STORAGE(DohProviderControlDStandard, ++ base::FEATURE_ENABLED_BY_DEFAULT), ++ {"76.76.2.2", "76.76.10.2", "2606:1a40::2", "2606:1a40:1::2"}, ++ /*dns_over_tls_hostnames=*/{"p2.freedns.controld.com"}, ++ "https://freedns.controld.com/p2", ++ /*ui_name=*/"Control D (Tracker & Malware Filtering)", ++ /*privacy_policy=*/"https://controld.com/privacy", ++ /*display_globally=*/true, ++ /*display_countries=*/{}, ++ LoggingLevel::kExtra}, ++ {"ControlDSocial", ++ MAKE_BASE_FEATURE_WITH_STATIC_STORAGE(DohProviderControlDSocial, ++ base::FEATURE_ENABLED_BY_DEFAULT), ++ {"76.76.2.3", "76.76.10.3", "2606:1a40::3", "2606:1a40:1::3"}, ++ /*dns_over_tls_hostnames=*/{"p3.freedns.controld.com"}, ++ "https://freedns.controld.com/p3", ++ /*ui_name=*/"", ++ /*privacy_policy=*/"", ++ /*display_globally=*/false, ++ /*display_countries=*/{}, ++ LoggingLevel::kExtra}, ++ {"ControlDFamily", ++ MAKE_BASE_FEATURE_WITH_STATIC_STORAGE(DohProviderControlDFamily, ++ base::FEATURE_ENABLED_BY_DEFAULT), ++ {"76.76.2.4", "76.76.10.4", "2606:1a40::4", "2606:1a40:1::4"}, ++ /*dns_over_tls_hostnames=*/{"family.freedns.controld.com"}, ++ "https://freedns.controld.com/family", ++ /*ui_name=*/"Control D (Tracker & Family Filtering)", ++ /*privacy_policy=*/"https://controld.com/privacy", ++ /*display_globally=*/true, ++ /*display_countries=*/{}, ++ LoggingLevel::kExtra}, ++ {"ControlDUncensored", ++ MAKE_BASE_FEATURE_WITH_STATIC_STORAGE(DohProviderControlDUncensored, ++ base::FEATURE_ENABLED_BY_DEFAULT), ++ {"76.76.2.5", "76.76.10.5", "2606:1a40::5", "2606:1a40:1::5"}, ++ /*dns_over_tls_hostnames=*/{"uncensored.freedns.controld.com"}, ++ "https://freedns.controld.com/uncensored", ++ /*ui_name=*/"", ++ /*privacy_policy=*/"", ++ /*display_globally=*/false, ++ /*display_countries=*/{}, ++ LoggingLevel::kExtra}, + {"Comcast", + MAKE_BASE_FEATURE_WITH_STATIC_STORAGE(DohProviderComcast, + base::FEATURE_ENABLED_BY_DEFAULT), +@@ -181,7 +271,7 @@ const DohProviderEntry::List& DohProviderEntry::GetList() { + /*ui_name=*/"Google (Public DNS)", + "https://developers.google.com/speed/public-dns/" + /*privacy_policy=*/"privacy", +- /*display_globally=*/true, ++ /*display_globally=*/false, + /*display_countries=*/{}, + LoggingLevel::kExtra}, + {"GoogleDns64", +@@ -225,7 +315,7 @@ const DohProviderEntry::List& DohProviderEntry::GetList() { + /*dns_over_tls_hostnames=*/{}, "https://chromium.dns.nextdns.io", + /*ui_name=*/"NextDNS", + /*privacy_policy=*/"https://nextdns.io/privacy", +- /*display_globally=*/false, /*display_countries=*/{"US"}, ++ /*display_globally=*/false, /*display_countries=*/{}, + LoggingLevel::kNormal}, + {"OpenDNS", + MAKE_BASE_FEATURE_WITH_STATIC_STORAGE(DohProviderOpenDNS, +@@ -237,7 +327,7 @@ const DohProviderEntry::List& DohProviderEntry::GetList() { + /*ui_name=*/"OpenDNS", + "https://www.cisco.com/c/en/us/about/legal/" + /*privacy_policy=*/"privacy-full.html", +- /*display_globally=*/true, ++ /*display_globally=*/false, + /*display_countries=*/{}, + LoggingLevel::kNormal}, + {"OpenDNSFamily", +@@ -282,7 +372,7 @@ const DohProviderEntry::List& DohProviderEntry::GetList() { + "https://dns.quad9.net/dns-query", + /*ui_name=*/"Quad9 (9.9.9.9)", + /*privacy_policy=*/"https://www.quad9.net/home/privacy/", +- /*display_globally=*/true, ++ /*display_globally=*/false, + /*display_countries=*/{}, + LoggingLevel::kExtra}, + {"Quickline", From dc3dbe9f72d7e03ee4e710fd063a7aa08f1ae254 Mon Sep 17 00:00:00 2001 From: Root <175176948+RKNF404@users.noreply.github.com> Date: Sat, 22 Feb 2025 01:15:35 -0500 Subject: [PATCH 2/6] chore: adjust wording --- patches/dns-providers.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/dns-providers.patch b/patches/dns-providers.patch index 4aef81b3..f64006ad 100644 --- a/patches/dns-providers.patch +++ b/patches/dns-providers.patch @@ -88,7 +88,7 @@ index 910a0c91aa1fa..4478396cdbe35 100644 + {"76.76.2.2", "76.76.10.2", "2606:1a40::2", "2606:1a40:1::2"}, + /*dns_over_tls_hostnames=*/{"p2.freedns.controld.com"}, + "https://freedns.controld.com/p2", -+ /*ui_name=*/"Control D (Tracker & Malware Filtering)", ++ /*ui_name=*/"Control D (Tracking & Malware Filtering)", + /*privacy_policy=*/"https://controld.com/privacy", + /*display_globally=*/true, + /*display_countries=*/{}, @@ -110,7 +110,7 @@ index 910a0c91aa1fa..4478396cdbe35 100644 + {"76.76.2.4", "76.76.10.4", "2606:1a40::4", "2606:1a40:1::4"}, + /*dns_over_tls_hostnames=*/{"family.freedns.controld.com"}, + "https://freedns.controld.com/family", -+ /*ui_name=*/"Control D (Tracker & Family Filtering)", ++ /*ui_name=*/"Control D (Tracking & Family Filtering)", + /*privacy_policy=*/"https://controld.com/privacy", + /*display_globally=*/true, + /*display_countries=*/{}, From 9be5280cea8bae4e12549c9bba64eb3dcff425f3 Mon Sep 17 00:00:00 2001 From: Root <175176948+RKNF404@users.noreply.github.com> Date: Sat, 22 Feb 2025 23:29:10 -0500 Subject: [PATCH 3/6] chore: auto upgrade DNS providers --- patches/dns-providers.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/patches/dns-providers.patch b/patches/dns-providers.patch index f64006ad..3b07f300 100644 --- a/patches/dns-providers.patch +++ b/patches/dns-providers.patch @@ -165,3 +165,16 @@ index 910a0c91aa1fa..4478396cdbe35 100644 /*display_countries=*/{}, LoggingLevel::kExtra}, {"Quickline", +diff --git a/net/dns/dns_config.h b/net/dns/dns_config.h +index aa2234239cbf0..45eb47a398806 100644 +--- a/net/dns/dns_config.h ++++ b/net/dns/dns_config.h +@@ -103,7 +103,7 @@ struct NET_EXPORT DnsConfig { + // If set to |true|, we will attempt to upgrade the user's DNS configuration + // to use DoH server(s) operated by the same provider(s) when the user is + // in AUTOMATIC mode and has not pre-specified DoH servers. +- bool allow_dns_over_https_upgrade = false; ++ bool allow_dns_over_https_upgrade = true; + }; + + } // namespace net From bba7a373632e3a5dc526376321608d8c9e7f7cab Mon Sep 17 00:00:00 2001 From: Root <175176948+RKNF404@users.noreply.github.com> Date: Sun, 23 Feb 2025 10:38:20 -0500 Subject: [PATCH 4/6] chore: revert previous commit --- patches/dns-providers.patch | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/patches/dns-providers.patch b/patches/dns-providers.patch index 3b07f300..f64006ad 100644 --- a/patches/dns-providers.patch +++ b/patches/dns-providers.patch @@ -165,16 +165,3 @@ index 910a0c91aa1fa..4478396cdbe35 100644 /*display_countries=*/{}, LoggingLevel::kExtra}, {"Quickline", -diff --git a/net/dns/dns_config.h b/net/dns/dns_config.h -index aa2234239cbf0..45eb47a398806 100644 ---- a/net/dns/dns_config.h -+++ b/net/dns/dns_config.h -@@ -103,7 +103,7 @@ struct NET_EXPORT DnsConfig { - // If set to |true|, we will attempt to upgrade the user's DNS configuration - // to use DoH server(s) operated by the same provider(s) when the user is - // in AUTOMATIC mode and has not pre-specified DoH servers. -- bool allow_dns_over_https_upgrade = false; -+ bool allow_dns_over_https_upgrade = true; - }; - - } // namespace net From dfcd72d26fbdd54a444ea46c4ca7574ab24b307c Mon Sep 17 00:00:00 2001 From: Root <175176948+RKNF404@users.noreply.github.com> Date: Sun, 23 Feb 2025 17:04:40 -0500 Subject: [PATCH 5/6] chore: add documentation links --- patches/dns-providers.patch | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/patches/dns-providers.patch b/patches/dns-providers.patch index f64006ad..cf8c6b70 100644 --- a/patches/dns-providers.patch +++ b/patches/dns-providers.patch @@ -1,5 +1,5 @@ diff --git a/net/dns/public/doh_provider_entry.cc b/net/dns/public/doh_provider_entry.cc -index 910a0c91aa1fa..4478396cdbe35 100644 +index 910a0c91aa1fa..bfe959f1475f2 100644 --- a/net/dns/public/doh_provider_entry.cc +++ b/net/dns/public/doh_provider_entry.cc @@ -77,7 +77,7 @@ const DohProviderEntry::List& DohProviderEntry::GetList() { @@ -20,7 +20,7 @@ index 910a0c91aa1fa..4478396cdbe35 100644 /*display_countries=*/{}, LoggingLevel::kNormal}, {"CleanBrowsingSecure", -@@ -117,15 +117,105 @@ const DohProviderEntry::List& DohProviderEntry::GetList() { +@@ -117,15 +117,107 @@ const DohProviderEntry::List& DohProviderEntry::GetList() { MAKE_BASE_FEATURE_WITH_STATIC_STORAGE(DohProviderCloudflare, base::FEATURE_ENABLED_BY_DEFAULT), {"1.1.1.1", "1.0.0.1", "2606:4700:4700::1111", "2606:4700:4700::1001"}, @@ -36,6 +36,7 @@ index 910a0c91aa1fa..4478396cdbe35 100644 /*display_globally=*/true, /*display_countries=*/{}, LoggingLevel::kExtra}, ++ // Cloudflare Source: https://developers.cloudflare.com/1.1.1.1/infrastructure/network-operators/#available-endpoints + {"CloudflareSecurity", + MAKE_BASE_FEATURE_WITH_STATIC_STORAGE(DohProviderCloudflareSecurity, + base::FEATURE_ENABLED_BY_DEFAULT), @@ -60,6 +61,7 @@ index 910a0c91aa1fa..4478396cdbe35 100644 + /*display_globally=*/true, + /*display_countries=*/{}, + LoggingLevel::kExtra}, ++ // Control D source: https://controld.com/free-dns + {"ControlD", + MAKE_BASE_FEATURE_WITH_STATIC_STORAGE(DohProviderControlD, + base::FEATURE_ENABLED_BY_DEFAULT), @@ -129,7 +131,7 @@ index 910a0c91aa1fa..4478396cdbe35 100644 {"Comcast", MAKE_BASE_FEATURE_WITH_STATIC_STORAGE(DohProviderComcast, base::FEATURE_ENABLED_BY_DEFAULT), -@@ -181,7 +271,7 @@ const DohProviderEntry::List& DohProviderEntry::GetList() { +@@ -181,7 +273,7 @@ const DohProviderEntry::List& DohProviderEntry::GetList() { /*ui_name=*/"Google (Public DNS)", "https://developers.google.com/speed/public-dns/" /*privacy_policy=*/"privacy", @@ -138,7 +140,7 @@ index 910a0c91aa1fa..4478396cdbe35 100644 /*display_countries=*/{}, LoggingLevel::kExtra}, {"GoogleDns64", -@@ -225,7 +315,7 @@ const DohProviderEntry::List& DohProviderEntry::GetList() { +@@ -225,7 +317,7 @@ const DohProviderEntry::List& DohProviderEntry::GetList() { /*dns_over_tls_hostnames=*/{}, "https://chromium.dns.nextdns.io", /*ui_name=*/"NextDNS", /*privacy_policy=*/"https://nextdns.io/privacy", @@ -147,7 +149,7 @@ index 910a0c91aa1fa..4478396cdbe35 100644 LoggingLevel::kNormal}, {"OpenDNS", MAKE_BASE_FEATURE_WITH_STATIC_STORAGE(DohProviderOpenDNS, -@@ -237,7 +327,7 @@ const DohProviderEntry::List& DohProviderEntry::GetList() { +@@ -237,7 +329,7 @@ const DohProviderEntry::List& DohProviderEntry::GetList() { /*ui_name=*/"OpenDNS", "https://www.cisco.com/c/en/us/about/legal/" /*privacy_policy=*/"privacy-full.html", @@ -156,7 +158,7 @@ index 910a0c91aa1fa..4478396cdbe35 100644 /*display_countries=*/{}, LoggingLevel::kNormal}, {"OpenDNSFamily", -@@ -282,7 +372,7 @@ const DohProviderEntry::List& DohProviderEntry::GetList() { +@@ -282,7 +374,7 @@ const DohProviderEntry::List& DohProviderEntry::GetList() { "https://dns.quad9.net/dns-query", /*ui_name=*/"Quad9 (9.9.9.9)", /*privacy_policy=*/"https://www.quad9.net/home/privacy/", From bed2f31e20a5148b873eb7659ef4c694dbd0df56 Mon Sep 17 00:00:00 2001 From: Root <175176948+RKNF404@users.noreply.github.com> Date: Sun, 23 Feb 2025 17:10:18 -0500 Subject: [PATCH 6/6] chore: adjust wording --- patches/dns-providers.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/dns-providers.patch b/patches/dns-providers.patch index cf8c6b70..31200552 100644 --- a/patches/dns-providers.patch +++ b/patches/dns-providers.patch @@ -36,7 +36,7 @@ index 910a0c91aa1fa..bfe959f1475f2 100644 /*display_globally=*/true, /*display_countries=*/{}, LoggingLevel::kExtra}, -+ // Cloudflare Source: https://developers.cloudflare.com/1.1.1.1/infrastructure/network-operators/#available-endpoints ++ // Source for Cloudflare IP addresses and hostnames/URLs: https://developers.cloudflare.com/1.1.1.1/infrastructure/network-operators/#available-endpoints + {"CloudflareSecurity", + MAKE_BASE_FEATURE_WITH_STATIC_STORAGE(DohProviderCloudflareSecurity, + base::FEATURE_ENABLED_BY_DEFAULT), @@ -61,7 +61,7 @@ index 910a0c91aa1fa..bfe959f1475f2 100644 + /*display_globally=*/true, + /*display_countries=*/{}, + LoggingLevel::kExtra}, -+ // Control D source: https://controld.com/free-dns ++ // Source for Control D IP addresses and hostnames/URLs: https://controld.com/free-dns + {"ControlD", + MAKE_BASE_FEATURE_WITH_STATIC_STORAGE(DohProviderControlD, + base::FEATURE_ENABLED_BY_DEFAULT),