From a2ade60cea833fec020bab2f232b27e246253717 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Thu, 30 Aug 2018 17:35:47 +0200 Subject: [PATCH 1/4] Add more detailed selections for the services offered by Quad9 and improve responsive design Signed-off-by: DL6ER --- scripts/pi-hole/php/savesettings.php | 4 +++- settings.php | 22 ++++++++++++++++++---- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/scripts/pi-hole/php/savesettings.php b/scripts/pi-hole/php/savesettings.php index 6d8a77b8..e58cf1dc 100644 --- a/scripts/pi-hole/php/savesettings.php +++ b/scripts/pi-hole/php/savesettings.php @@ -123,7 +123,9 @@ function isinserverlist($addr) { "Norton" => ["v4_1" => "199.85.126.10", "v4_2" => "199.85.127.10"], "Comodo" => ["v4_1" => "8.26.56.26", "v4_2" => "8.20.247.20"], "DNS.WATCH" => ["v4_1" => "84.200.69.80", "v4_2" => "84.200.70.40", "v6_1" => "2001:1608:10:25:0:0:1c04:b12f", "v6_2" => "2001:1608:10:25:0:0:9249:d69b"], - "Quad9" => ["v4_1" => "9.9.9.9", "v4_2" => "149.112.112.112", "v6_1" => "2620:fe::fe"], + "Quad9 (filtered, DNSSEC)" => ["v4_1" => "9.9.9.9", "v4_2" => "149.112.112.112", "v6_1" => "2620:fe::fe"], + "Quad9 (unfiltered, no DNSSEC)" => ["v4_1" => "9.9.9.10", "v4_2" => "149.112.112.10", "v6_1" => "2620:fe::10"], + "Quad9 (filtered + ECS)" => ["v4_1" => "9.9.9.11", "v4_2" => "149.112.112.11", "v6_1" => "2620:fe::11"], "Cloudflare" => ["v4_1" => "1.1.1.1", "v4_2" => "1.0.0.1", "v6_1" => "2606:4700:4700::1111", "v6_2" => "2606:4700:4700::1001"] ]; diff --git a/settings.php b/settings.php index 3e2a676d..231ad286 100644 --- a/settings.php +++ b/settings.php @@ -317,14 +317,14 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists" if (isset($setupVars["DHCP_END"])) { $DHCPend = $setupVars["DHCP_END"]; } else { - $DHCPend = ""; + $DHCPend = ""; } if (isset($setupVars["DHCP_ROUTER"])) { $DHCProuter = $setupVars["DHCP_ROUTER"]; } else { $DHCProuter = ""; } - + // This setting has been added later, we have to check if it exists if (isset($setupVars["DHCP_LEASETIME"])) { $DHCPleasetime = $setupVars["DHCP_LEASETIME"]; @@ -651,7 +651,7 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
-
+
@@ -699,8 +699,18 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
IPv4
+
+
+
+ +
+
+
+

Upstream DNS Servers

+
+
+
-
@@ -720,6 +730,10 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists" value="">
+
+
+
+
From 7a391edbe82f3214016bc9f872431cddd7e14537 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Thu, 30 Aug 2018 17:44:53 +0200 Subject: [PATCH 2/4] Optimize responsive design for medium (md) screens Signed-off-by: DL6ER --- settings.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/settings.php b/settings.php index 231ad286..f64f3acd 100644 --- a/settings.php +++ b/settings.php @@ -710,7 +710,7 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
-
+
@@ -732,7 +732,7 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
-
+
From 9a950147c4dd7c6a9a8bac47aa27269f9f117f69 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Thu, 30 Aug 2018 17:56:11 +0200 Subject: [PATCH 3/4] Add explanation what ECS is as we shouldn't use acronyms without explaining them. Further, this information may be useful for less tech-savvy users. Add that (at least) Google, OpenDNS, and Cloudflare use ECS (according to http://www.afasterinternet.com/participants.htm). I found no reference for the other providers in the table. Signed-off-by: DL6ER --- scripts/pi-hole/php/savesettings.php | 6 +++--- settings.php | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/pi-hole/php/savesettings.php b/scripts/pi-hole/php/savesettings.php index e58cf1dc..785f0b41 100644 --- a/scripts/pi-hole/php/savesettings.php +++ b/scripts/pi-hole/php/savesettings.php @@ -117,8 +117,8 @@ function isinserverlist($addr) { } $DNSserverslist = [ - "Google" => ["v4_1" => "8.8.8.8","v4_2" => "8.8.4.4", "v6_1" => "2001:4860:4860:0:0:0:0:8888", "v6_2" => "2001:4860:4860:0:0:0:0:8844"], - "OpenDNS" => ["v4_1" => "208.67.222.222", "v4_2" => "208.67.220.220", "v6_1" => "2620:0:ccc::2", "v6_2" => "2620:0:ccd::2"], + "Google (ECS)" => ["v4_1" => "8.8.8.8","v4_2" => "8.8.4.4", "v6_1" => "2001:4860:4860:0:0:0:0:8888", "v6_2" => "2001:4860:4860:0:0:0:0:8844"], + "OpenDNS (ECS)" => ["v4_1" => "208.67.222.222", "v4_2" => "208.67.220.220", "v6_1" => "2620:0:ccc::2", "v6_2" => "2620:0:ccd::2"], "Level3" => ["v4_1" => "4.2.2.1", "v4_2" => "4.2.2.2"], "Norton" => ["v4_1" => "199.85.126.10", "v4_2" => "199.85.127.10"], "Comodo" => ["v4_1" => "8.26.56.26", "v4_2" => "8.20.247.20"], @@ -126,7 +126,7 @@ function isinserverlist($addr) { "Quad9 (filtered, DNSSEC)" => ["v4_1" => "9.9.9.9", "v4_2" => "149.112.112.112", "v6_1" => "2620:fe::fe"], "Quad9 (unfiltered, no DNSSEC)" => ["v4_1" => "9.9.9.10", "v4_2" => "149.112.112.10", "v6_1" => "2620:fe::10"], "Quad9 (filtered + ECS)" => ["v4_1" => "9.9.9.11", "v4_2" => "149.112.112.11", "v6_1" => "2620:fe::11"], - "Cloudflare" => ["v4_1" => "1.1.1.1", "v4_2" => "1.0.0.1", "v6_1" => "2606:4700:4700::1111", "v6_2" => "2606:4700:4700::1001"] + "Cloudflare (ECS)" => ["v4_1" => "1.1.1.1", "v4_2" => "1.0.0.1", "v6_1" => "2606:4700:4700::1111", "v6_2" => "2606:4700:4700::1001"] ]; $adlist = []; diff --git a/settings.php b/settings.php index f64f3acd..14718bf6 100644 --- a/settings.php +++ b/settings.php @@ -698,6 +698,7 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists" +

ECS (Extended Client Subnet) defines a mechanism for recursive resolvers to send partial client IP address information to authoritative DNS name servers. Content Delivery Networks (CDNs) and latency-sensitive services use this to give accurate geo-located responses when responding to name lookups coming through public DNS resolvers. See RFC 7871 for further details.

From 6d4d769b989f7a05832813e0f2c6394b31aa90d6 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Thu, 30 Aug 2018 18:12:09 +0200 Subject: [PATCH 4/4] Add note that using ECS may lead to reduced privacy (as the DNS server will have to pass the IP address of the requester to the auth. server of the CDN network so that they can tell who is the geo-located response) Signed-off-by: DL6ER --- settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.php b/settings.php index 14718bf6..e27de2d5 100644 --- a/settings.php +++ b/settings.php @@ -698,7 +698,7 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists" -

ECS (Extended Client Subnet) defines a mechanism for recursive resolvers to send partial client IP address information to authoritative DNS name servers. Content Delivery Networks (CDNs) and latency-sensitive services use this to give accurate geo-located responses when responding to name lookups coming through public DNS resolvers. See RFC 7871 for further details.

+

ECS (Extended Client Subnet) defines a mechanism for recursive resolvers to send partial client IP address information to authoritative DNS name servers. Content Delivery Networks (CDNs) and latency-sensitive services use this to give geo-located responses when responding to name lookups coming through public DNS resolvers. Note that ECS may result in reduced privacy.