From f14b4747c7e6f9706f3ebd007616b5813cf8c6b3 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Thu, 15 Dec 2016 18:10:18 +0100 Subject: [PATCH 01/11] Try to resolve local IPs to hostnames if API_GET_CLIENT_HOSTNAME is true --- data.php | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/data.php b/data.php index 333907c02..b23b16eea 100644 --- a/data.php +++ b/data.php @@ -111,13 +111,27 @@ function getForwardDestinations() { } + // Check for existance of variable + // and test it only if it exists + function istrue($argument) { + $ret = false; + if(isset($argument)) + { + if($argument) + { + $ret = true; + } + } + return $ret; + } + function getQuerySources() { global $log; $dns_queries = getDnsQueries($log); $sources = array(); foreach($dns_queries as $query) { $exploded = explode(" ", $query); - $ip = hasHostName(trim($exploded[count($exploded)-1])); + $ip = trim($exploded[count($exploded)-1]); if (isset($sources[$ip])) { $sources[$ip]++; } @@ -134,6 +148,25 @@ function getQuerySources() { arsort($sources); $sources = array_slice($sources, 0, 10); + + if(istrue($setupVars["API_GET_CLIENT_HOSTNAME"])) + { + foreach ($sources as $key => $value) + { + $hostname = gethostbyaddr($key); + // If we found a hostname for the IP, replace it + if($hostname) + { + // Generate HOST entry + $sources[$hostname] = $sources[$key]; + // Remove IP entry + unset($sources[$key]); + } + } + // Have to repeat the sorting, since we changed the keys + arsort($sources); + } + return Array( 'top_sources' => $sources ); From 90bc298b9c8a5470df23a184ae1c2ddbd6573b8a Mon Sep 17 00:00:00 2001 From: DL6ER Date: Thu, 15 Dec 2016 18:27:49 +0100 Subject: [PATCH 02/11] Implemented function resolveIPs(&$array) --- data.php | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/data.php b/data.php index b23b16eea..6ca948458 100644 --- a/data.php +++ b/data.php @@ -92,6 +92,23 @@ function getIpvType() { return $queryTypes; } + function resolveIPs(&$array) { + foreach ($array as $key => $value) + { + $hostname = gethostbyaddr($key); + // If we found a hostname for the IP, replace it + if($hostname) + { + // Generate HOST entry + $array[$hostname] = $array[$key]; + // Remove IP entry + unset($array[$key]); + } + } + // Have to repeat the sorting, since we changed the keys + arsort($array); + } + function getForwardDestinations() { global $log; $forwards = getForwards($log); @@ -151,20 +168,7 @@ function getQuerySources() { if(istrue($setupVars["API_GET_CLIENT_HOSTNAME"])) { - foreach ($sources as $key => $value) - { - $hostname = gethostbyaddr($key); - // If we found a hostname for the IP, replace it - if($hostname) - { - // Generate HOST entry - $sources[$hostname] = $sources[$key]; - // Remove IP entry - unset($sources[$key]); - } - } - // Have to repeat the sorting, since we changed the keys - arsort($sources); + resolveIPs($sources); } return Array( From 433b3c634f30e476aa1744e1fff3e674ae4d20f1 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Thu, 15 Dec 2016 18:28:16 +0100 Subject: [PATCH 03/11] Improved function getForwardDestinations() --- data.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/data.php b/data.php index 6ca948458..9be2af331 100644 --- a/data.php +++ b/data.php @@ -115,7 +115,7 @@ function getForwardDestinations() { $destinations = array(); foreach ($forwards as $forward) { $exploded = explode(" ", trim($forward)); - $dest = hasHostName($exploded[count($exploded) - 1]); + $dest = $exploded[count($exploded) - 1]; if (isset($destinations[$dest])) { $destinations[$dest]++; } @@ -124,6 +124,8 @@ function getForwardDestinations() { } } + resolveIPs($destinations); + return $destinations; } From b6adeb50a8ceeed9afdef49100577ab2bbf291cd Mon Sep 17 00:00:00 2001 From: DL6ER Date: Thu, 15 Dec 2016 18:32:01 +0100 Subject: [PATCH 04/11] Add API_GET_UPSTREAM_DNS_HOSTNAME option --- data.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/data.php b/data.php index 9be2af331..70eaed829 100644 --- a/data.php +++ b/data.php @@ -124,7 +124,10 @@ function getForwardDestinations() { } } - resolveIPs($destinations); + if(istrue($setupVars["API_GET_UPSTREAM_DNS_HOSTNAME"])) + { + resolveIPs($destinations); + } return $destinations; From cc7b03d3e74cccb172ff2477d14082fb961958d3 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Thu, 15 Dec 2016 18:48:24 +0100 Subject: [PATCH 05/11] Implemented the corresponding Settings part --- php/savesettings.php | 32 ++++++++++++++++++++++++++++++++ settings.php | 43 ++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 72 insertions(+), 3 deletions(-) diff --git a/php/savesettings.php b/php/savesettings.php index 7460305cd..87459ccd1 100644 --- a/php/savesettings.php +++ b/php/savesettings.php @@ -9,6 +9,20 @@ function validIP($address){ return !filter_var($address, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) === false; } +// Check for existance of variable +// and test it only if it exists +function istrue($argument) { + $ret = false; + if(isset($argument)) + { + if($argument) + { + $ret = true; + } + } + return $ret; +} + // Credit: http://stackoverflow.com/a/4694816/2087442 function validDomain($domain_name) { @@ -208,6 +222,24 @@ function validDomain($domain_name) $success .= "No entries will be shown in Query Log"; } + if(isset($_POST["resolve-forward"])) + { + exec("sudo pihole -a resolve forward true"); + } + else + { + exec("sudo pihole -a resolve forward false"); + } + + if(isset($_POST["resolve-clients"])) + { + exec("sudo pihole -a resolve clients true"); + } + else + { + exec("sudo pihole -a resolve clients false"); + } + break; case "webUI": diff --git a/settings.php b/settings.php index 2743bc71f..dd2fdfdce 100644 --- a/settings.php +++ b/settings.php @@ -379,6 +379,25 @@ } else { $queryLog = "all"; } + + if(istrue($setupVars["API_GET_UPSTREAM_DNS_HOSTNAME"])) + { + $resolveForward = true; + } + else + { + $resolveForward = false; + } + + if(istrue($setupVars["API_GET_CLIENT_HOSTNAME"])) + { + $resolveClients = true; + } + else + { + $resolveClients = false; + } + ?>
@@ -400,10 +419,28 @@
+

Reverse DNS lookup

+

Try to determine the domain name via querying the Pi-hole for

+
+
+
+
+
+
+
+
+
+

Query Log

-
-
-
+
+
+
+
+
+
+
+
+
From 41f3a80c36da385a4fcc828243ae1e4c50b09eaf Mon Sep 17 00:00:00 2001 From: DL6ER Date: Fri, 16 Dec 2016 13:28:58 +0100 Subject: [PATCH 06/11] codacy fix: added missing `global` statements --- data.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data.php b/data.php index 70eaed829..6320c7c28 100644 --- a/data.php +++ b/data.php @@ -110,7 +110,7 @@ function resolveIPs(&$array) { } function getForwardDestinations() { - global $log; + global $log, $setupVars; $forwards = getForwards($log); $destinations = array(); foreach ($forwards as $forward) { @@ -148,7 +148,7 @@ function istrue($argument) { } function getQuerySources() { - global $log; + global $log, $setupVars; $dns_queries = getDnsQueries($log); $sources = array(); foreach($dns_queries as $query) { @@ -186,7 +186,7 @@ function getQuerySources() { function setShowBlockedPermitted() { - global $showBlocked, $showPermitted; + global $showBlocked, $showPermitted, $setupVars; if(isset($setupVars["API_QUERY_LOG_SHOW"])) { if($setupVars["API_QUERY_LOG_SHOW"] === "all") From 5cda21d336c1036a3d16f13cf2683438f92bb656 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sat, 17 Dec 2016 13:56:11 +0100 Subject: [PATCH 07/11] Pass pointer to variable to function istrue() to prevent "undefined variable" errors --- data.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data.php b/data.php index 6320c7c28..d39acfd89 100644 --- a/data.php +++ b/data.php @@ -135,7 +135,7 @@ function getForwardDestinations() { // Check for existance of variable // and test it only if it exists - function istrue($argument) { + function istrue(&$argument) { $ret = false; if(isset($argument)) { From 04c1feda454a360862976cda1fd9077463a978e7 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sat, 17 Dec 2016 13:59:00 +0100 Subject: [PATCH 08/11] Use $value instead of $array[$key] --- data.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data.php b/data.php index d39acfd89..33c560d68 100644 --- a/data.php +++ b/data.php @@ -100,7 +100,7 @@ function resolveIPs(&$array) { if($hostname) { // Generate HOST entry - $array[$hostname] = $array[$key]; + $array[$hostname] = $value; // Remove IP entry unset($array[$key]); } From a0b4083327bf46796cf4f7f1bf9eca9142f42ccc Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sat, 17 Dec 2016 14:02:37 +0100 Subject: [PATCH 09/11] Refined function resolveIPs(&$array). It's now faster, cleaner and more readable --- data.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/data.php b/data.php index 33c560d68..cb98ccfca 100644 --- a/data.php +++ b/data.php @@ -93,6 +93,7 @@ function getIpvType() { } function resolveIPs(&$array) { + $hostarray = []; foreach ($array as $key => $value) { $hostname = gethostbyaddr($key); @@ -100,12 +101,17 @@ function resolveIPs(&$array) { if($hostname) { // Generate HOST entry - $array[$hostname] = $value; - // Remove IP entry - unset($array[$key]); + $hostarray[$hostname] = $value; + } + else + { + // Generate IP entry + $hostarray[$key] = $value; } } - // Have to repeat the sorting, since we changed the keys + $array = $hostarray; + + // Sort new array arsort($array); } From dfa2f071a912b50bddd8dba2389e830d6b59372e Mon Sep 17 00:00:00 2001 From: DL6ER Date: Wed, 21 Dec 2016 13:35:34 +0100 Subject: [PATCH 10/11] Only look for query[A, i.e. query[A] and query[AAAA] --- scripts/pi-hole/php/data.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/pi-hole/php/data.php b/scripts/pi-hole/php/data.php index b867a273e..6eb687158 100644 --- a/scripts/pi-hole/php/data.php +++ b/scripts/pi-hole/php/data.php @@ -295,7 +295,7 @@ function getDnsQueries(\SplFileObject $log) { $log->rewind(); $lines = []; foreach ($log as $line) { - if(strpos($line, ": query[") !== false) { + if(strpos($line, ": query[A") !== false) { $lines[] = $line; } } @@ -303,14 +303,14 @@ function getDnsQueries(\SplFileObject $log) { } function countDnsQueries() { - return exec("grep -c \": query\\[\" /var/log/pihole.log"); + return exec("grep -c \": query\\[A\" /var/log/pihole.log"); } function getDnsQueriesAll(\SplFileObject $log) { $log->rewind(); $lines = []; foreach ($log as $line) { - if(strpos($line, ": query[") || strpos($line, "gravity.list") || strpos($line, ": forwarded") !== false) { + if(strpos($line, ": query[A") || strpos($line, "gravity.list") || strpos($line, ": forwarded") !== false) { $lines[] = $line; } } From ad5f1115a103c0dad5917c3e313aaf34c5e9aa3e Mon Sep 17 00:00:00 2001 From: DL6ER Date: Wed, 21 Dec 2016 13:38:00 +0100 Subject: [PATCH 11/11] Change from getDnsQueriesAll($log) to getDnsQueries($log). Don't have to check if the line includes "query" since we only collect "query" lines now --- scripts/pi-hole/php/data.php | 57 +++++++++++++++++------------------- 1 file changed, 27 insertions(+), 30 deletions(-) diff --git a/scripts/pi-hole/php/data.php b/scripts/pi-hole/php/data.php index 6eb687158..1957c6fc4 100644 --- a/scripts/pi-hole/php/data.php +++ b/scripts/pi-hole/php/data.php @@ -235,7 +235,7 @@ function setShowBlockedPermitted() function getAllQueries($orderBy) { global $log,$showBlocked,$showPermitted; $allQueries = array("data" => array()); - $dns_queries = getDnsQueriesAll($log); + $dns_queries = getDnsQueries($log); // Create empty array for gravity $gravity_domains = getGravity(); @@ -248,36 +248,33 @@ function getAllQueries($orderBy) { setShowBlockedPermitted(); - if (substr($tmp, 0, 5) == "query") + $status = isset($gravity_domains[$domain]) ? "Pi-holed" : "OK"; + if(($status === "Pi-holed" && $showBlocked) || ($status === "OK" && $showPermitted)) { - $status = isset($gravity_domains[$domain]) ? "Pi-holed" : "OK"; - if(($status === "Pi-holed" && $showBlocked) || ($status === "OK" && $showPermitted)) - { - $type = substr($exploded[count($exploded)-4], 6, -1); - $client = $exploded[count($exploded)-1]; - - if($orderBy == "orderByClientDomainTime"){ - $allQueries['data'][hasHostName($client)][$domain][$time->format('Y-m-d\TH:i:s')] = $status; - }elseif ($orderBy == "orderByClientTimeDomain"){ - $allQueries['data'][hasHostName($client)][$time->format('Y-m-d\TH:i:s')][$domain] = $status; - }elseif ($orderBy == "orderByTimeClientDomain"){ - $allQueries['data'][$time->format('Y-m-d\TH:i:s')][hasHostName($client)][$domain] = $status; - }elseif ($orderBy == "orderByTimeDomainClient"){ - $allQueries['data'][$time->format('Y-m-d\TH:i:s')][$domain][hasHostName($client)] = $status; - }elseif ($orderBy == "orderByDomainClientTime"){ - $allQueries['data'][$domain][hasHostName($client)][$time->format('Y-m-d\TH:i:s')] = $status; - }elseif ($orderBy == "orderByDomainTimeClient"){ - $allQueries['data'][$domain][$time->format('Y-m-d\TH:i:s')][hasHostName($client)] = $status; - }else{ - array_push($allQueries['data'], array( - $time->format('Y-m-d\TH:i:s'), - $type, - $domain, - hasHostName($client), - $status, - "" - )); - } + $type = substr($exploded[count($exploded)-4], 6, -1); + $client = $exploded[count($exploded)-1]; + + if($orderBy == "orderByClientDomainTime"){ + $allQueries['data'][hasHostName($client)][$domain][$time->format('Y-m-d\TH:i:s')] = $status; + }elseif ($orderBy == "orderByClientTimeDomain"){ + $allQueries['data'][hasHostName($client)][$time->format('Y-m-d\TH:i:s')][$domain] = $status; + }elseif ($orderBy == "orderByTimeClientDomain"){ + $allQueries['data'][$time->format('Y-m-d\TH:i:s')][hasHostName($client)][$domain] = $status; + }elseif ($orderBy == "orderByTimeDomainClient"){ + $allQueries['data'][$time->format('Y-m-d\TH:i:s')][$domain][hasHostName($client)] = $status; + }elseif ($orderBy == "orderByDomainClientTime"){ + $allQueries['data'][$domain][hasHostName($client)][$time->format('Y-m-d\TH:i:s')] = $status; + }elseif ($orderBy == "orderByDomainTimeClient"){ + $allQueries['data'][$domain][$time->format('Y-m-d\TH:i:s')][hasHostName($client)] = $status; + }else{ + array_push($allQueries['data'], array( + $time->format('Y-m-d\TH:i:s'), + $type, + $domain, + hasHostName($client), + $status, + "" + )); } } }