Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-04-25 11:19:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow multiple upstream DNS server selection

Browse Source
This commit is contained in:
DL6ER
2017-01-13 17:49:16 +01:00
parent 0924f20214
commit 6760ba80a7
3 changed files with 100 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
scripts/pi-hole/php/savesettings.php
View File

@@ -32,20 +32,17 @@ function validDomain($domain_name)
return ( $validChars && $lengthCheck && $labelLengthCheck ); //length of each label
}
$primaryDNSservers = [
"8.8.8.8" => "Google",
"208.67.222.222" => "OpenDNS",
"4.2.2.1" => "Level3",
"199.85.126.10" => "Norton",
"8.26.56.26" => "Comodo"
];
$secondaryDNSservers = [
"8.8.4.4" => "Google",
"208.67.220.220" => "OpenDNS",
"4.2.2.2" => "Level3",
"199.85.127.10" => "Norton",
"8.20.247.20" => "Comodo"
$DNSserverslist = [
"8.8.8.8" => "Google (Primary)",
"208.67.222.222" => "OpenDNS (Primary)",
"4.2.2.1" => "Level3 (Primary)",
"199.85.126.10" => "Norton (Primary)",
"8.26.56.26" => "Comodo (Primary)",
"8.8.4.4" => "Google (Secondary)",
"208.67.220.220" => "OpenDNS (Secondary)",
"4.2.2.2" => "Level3 (Secondary)",
"199.85.127.10" => "Norton (Secondary)",
"8.20.247.20" => "Comodo (Secondary)"
];
$error = "";
@@ -57,61 +54,38 @@ function validDomain($domain_name)
switch ($_POST["field"]) {
// Set DNS server
case "DNS":
$primaryDNS = $_POST["primaryDNS"];
$secondaryDNS = $_POST["secondaryDNS"];
// Get primary DNS server IP address
if($primaryDNS === "Customv4")
$DNSservers = [];
// Add selected predefined servers to list
foreach ($DNSserverslist as $key => $value)
{
$primaryIP = $_POST["DNS1IPv4"];
}
elseif($primaryDNS === "Customv6")
{
$primaryIP = $_POST["DNS1IPv6"];
}
else
{
$primaryIP = array_flip($primaryDNSservers)[$primaryDNS];
}
// Validate primary IP
if (!validIP($primaryIP))
{
$error .= "Primary IP (".$primaryIP.") is invalid!<br>";
}
// Get secondary DNS server IP address
if($secondaryDNS === "Customv4")
{
if(strlen($_POST["DNS2IPv4"]) > 0)
if(array_key_exists("DNSserver".str_replace(".","_",$key),$_POST))
{
$secondaryIP = $_POST["DNS2IPv4"];
}
else
{
$secondaryIP = "none";
array_push($DNSservers,$key);
}
}
elseif($secondaryDNS === "Customv6")
// Test custom server fields
for($i=1;$i<=4;$i++)
{
if(strlen($_POST["DNS2IPv6"]) > 0)
if(array_key_exists("custom".$i,$_POST))
{
$secondaryIP = $_POST["DNS2IPv6"];
$IP = $_POST["custom".$i."val"];
if(validIP($IP))
{
array_push($DNSservers,$IP);
}
else
{
$error .= "IP (".$IP.") is invalid!<br>";
}
}
else
{
$secondaryIP = "none";
}
}
else
{
$secondaryIP = array_flip($secondaryDNSservers)[$secondaryDNS];
}
// Validate secondary IP
if (!validIP($secondaryIP) && $secondaryIP != "none" && strlen($secondaryIP) > 0)
// Check if at least one DNS server has been added
if(count($DNSservers) < 1)
{
$error .= "Secondary IP (".$secondaryIP.") is invalid!<br>";
$error .= "No DNS server has been selected.<br>";
}
// Check if domain-needed is requested
@@ -147,8 +121,9 @@ function validDomain($domain_name)
// If there has been no error we can save the new DNS server IPs
if(!strlen($error))
{
exec("sudo pihole -a setdns ".$primaryIP." ".$secondaryIP." ".$extra);
$success .= "The DNS settings have been updated";
$IPs = implode (",", $DNSservers);
exec("sudo pihole -a setdns ".$IPs." ".$extra);
$success .= "The DNS settings have been updated (using ".count($DNSservers)." DNS servers)";
}
else
{