From f14b4747c7e6f9706f3ebd007616b5813cf8c6b3 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Thu, 15 Dec 2016 18:10:18 +0100 Subject: [PATCH 01/63] 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 333907c0..b23b16ee 100644 --- a/data.php +++ b/data.php @@ -111,13 +111,27 @@ } + // 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 @@ 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/63] Implemented function resolveIPs(&$array) --- data.php | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/data.php b/data.php index b23b16ee..6ca94845 100644 --- a/data.php +++ b/data.php @@ -92,6 +92,23 @@ 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 @@ 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/63] Improved function getForwardDestinations() --- data.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/data.php b/data.php index 6ca94845..9be2af33 100644 --- a/data.php +++ b/data.php @@ -115,7 +115,7 @@ $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 @@ } } + 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/63] 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 9be2af33..70eaed82 100644 --- a/data.php +++ b/data.php @@ -124,7 +124,10 @@ } } - 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/63] 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 7460305c..87459ccd 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 2743bc71..dd2fdfdc 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/63] 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 70eaed82..6320c7c2 100644 --- a/data.php +++ b/data.php @@ -110,7 +110,7 @@ } function getForwardDestinations() { - global $log; + global $log, $setupVars; $forwards = getForwards($log); $destinations = array(); foreach ($forwards as $forward) { @@ -148,7 +148,7 @@ } function getQuerySources() { - global $log; + global $log, $setupVars; $dns_queries = getDnsQueries($log); $sources = array(); foreach($dns_queries as $query) { @@ -186,7 +186,7 @@ function setShowBlockedPermitted() { - global $showBlocked, $showPermitted; + global $showBlocked, $showPermitted, $setupVars; if(isset($setupVars["API_QUERY_LOG_SHOW"])) { if($setupVars["API_QUERY_LOG_SHOW"] === "all") From dbbc1a770b683a2387a57b23367468c26039b3f5 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Fri, 16 Dec 2016 17:32:44 +0100 Subject: [PATCH 07/63] Add privacy mode --- data.php | 24 ++++++++++++++++++++---- js/pihole/index.js | 9 +++++++-- php/savesettings.php | 9 +++++++++ settings.php | 13 +++++++++++++ 4 files changed, 49 insertions(+), 6 deletions(-) diff --git a/data.php b/data.php index 333907c0..064c5453 100644 --- a/data.php +++ b/data.php @@ -5,6 +5,13 @@ $log = new \SplFileObject('/var/log/pihole.log'); $gravity = new \SplFileObject('/etc/pihole/list.preEventHorizon'); + if(isset($setupVars["API_PRIVACY_MODE"])) + { + $privacyMode = $setupVars["API_PRIVACY_MODE"]; + } else { + $privacyMode = false; + } + /******* Public Members ********/ function getSummaryData() { $domains_being_blocked = gravityCount(); @@ -52,12 +59,19 @@ } function getTopItems() { - global $log; + global $log,$privacyMode; $dns_queries = getDnsQueries($log); $ads_blocked = getBlockedQueries($log); $topAds = topItems($ads_blocked); - $topQueries = topItems($dns_queries, $topAds); + if(!$privacyMode) + { + $topQueries = topItems($dns_queries, $topAds); + } + else + { + $topQueries = []; + } return Array( 'top_queries' => $topQueries, @@ -182,7 +196,7 @@ } function getAllQueries($orderBy) { - global $log,$gravity,$showBlocked,$showPermitted; + global $log,$gravity,$showBlocked,$showPermitted,$privacyMode; $allQueries = array("data" => array()); $dns_queries = getDnsQueriesAll($log); $gravity_domains = getGravityDomains($gravity); @@ -198,7 +212,9 @@ if (substr($tmp, 0, 5) == "query") { $status = isset($gravity_domains[$domain]) ? "Pi-holed" : "OK"; - if(($status === "Pi-holed" && $showBlocked) || ($status === "OK" && $showPermitted)) + // Display blocked queries if $showBlocked is set + // Display permitted queries if $showPermitted is set and $privacyMode is disabled + if(($status === "Pi-holed" && $showBlocked) || ($status === "OK" && $showPermitted && !$privacyMode)) { $type = substr($exploded[count($exploded)-4], 6, -1); $client = $exploded[count($exploded)-1]; diff --git a/js/pihole/index.js b/js/pihole/index.js index 5d7dba0e..b010e070 100644 --- a/js/pihole/index.js +++ b/js/pihole/index.js @@ -180,7 +180,6 @@ function updateTopLists() { var domaintable = $("#domain-frequency").find("tbody:last"); var adtable = $("#ad-frequency").find("tbody:last"); var url, domain, percentage; - for (domain in data.top_queries) { if ({}.hasOwnProperty.call(data.top_queries,domain)){ // Sanitize domain @@ -198,8 +197,14 @@ function updateTopLists() { " " + data.top_queries[domain] + "
"); } - } + + // Remove table if there are no results (e.g. privacy mode enabled) + if(jQuery.isEmptyObject(data.top_queries)) + { + $("#domain-frequency").parent().remove(); + } + for (domain in data.top_ads) { if ({}.hasOwnProperty.call(data.top_ads,domain)){ // Sanitize domain diff --git a/php/savesettings.php b/php/savesettings.php index 27fa763c..433c7f0f 100644 --- a/php/savesettings.php +++ b/php/savesettings.php @@ -209,6 +209,15 @@ function validDomain($domain_name) $success .= "No entries will be shown in Query Log"; } + if(isset($_POST["privacyMode"])) + { + exec("sudo pihole -a privacymode true"); + } + else + { + exec("sudo pihole -a privacymode false"); + } + break; case "webUI": diff --git a/settings.php b/settings.php index ed2e7b0b..2505e495 100644 --- a/settings.php +++ b/settings.php @@ -379,6 +379,15 @@ } else { $queryLog = "all"; } + + // Privacy Mode + if(isset($setupVars["API_PRIVACY_MODE"])) + { + $privacyMode = $setupVars["API_PRIVACY_MODE"]; + } else { + $privacyMode = false; + } + ?>
@@ -405,6 +414,10 @@
+

Privacy mode

+
+
+
From 5cda21d336c1036a3d16f13cf2683438f92bb656 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sat, 17 Dec 2016 13:56:11 +0100 Subject: [PATCH 08/63] 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 6320c7c2..d39acfd8 100644 --- a/data.php +++ b/data.php @@ -135,7 +135,7 @@ // 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 09/63] 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 d39acfd8..33c560d6 100644 --- a/data.php +++ b/data.php @@ -100,7 +100,7 @@ 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 10/63] 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 33c560d6..cb98ccfc 100644 --- a/data.php +++ b/data.php @@ -93,6 +93,7 @@ } function resolveIPs(&$array) { + $hostarray = []; foreach ($array as $key => $value) { $hostname = gethostbyaddr($key); @@ -100,12 +101,17 @@ 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 5cbc20f4776e97d8fff894a572b114ce1adbdb1f Mon Sep 17 00:00:00 2001 From: DL6ER Date: Mon, 19 Dec 2016 11:36:58 +0100 Subject: [PATCH 11/63] Simplified function getBlockedQueries() --- data.php | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/data.php b/data.php index 2a145110..e02ee43e 100644 --- a/data.php +++ b/data.php @@ -285,11 +285,22 @@ $line = preg_replace('/ {2,}/', ' ', $line); $exploded = explode(" ", $line); if(count($exploded) == 8) { - $tmp = $exploded[count($exploded) - 4]; - $tmp2 = $exploded[count($exploded) - 5]; - $tmp3 = $exploded[count($exploded) - 3]; - //filter out bad names and host file reloads: - if(substr($tmp, strlen($tmp) - 12, 12) == "gravity.list" && $tmp2 != "read" && $tmp3 != "pi.hole" && $tmp3 != $hostname) { + // Structure of data is currently like: + // Array + // ( + // [0] => Dec + // [1] => 19 + // [2] => 11:21:51 + // [3] => dnsmasq[2584]: + // [4] => /etc/pihole/gravity.list + // [5] => doubleclick.com + // [6] => is + // [7] => ip.of.pi.hole + // ) + $list = $exploded[4]; + $is = $exploded[6]; + // Consider only gravity.list as DNS source (not e.g. hostname.list) + if(substr($list, strlen($list) - 12, 12) == "gravity.list" && $is === "is") { $lines[] = $line; }; } From 42e9644a3ff7980c389060616e293570151cba1e Mon Sep 17 00:00:00 2001 From: DL6ER Date: Mon, 19 Dec 2016 11:38:04 +0100 Subject: [PATCH 12/63] Greatly simplified function countBlockedQueries() --- data.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data.php b/data.php index e02ee43e..57d8aa4f 100644 --- a/data.php +++ b/data.php @@ -310,7 +310,7 @@ function countBlockedQueries() { $hostname = trim(file_get_contents("/etc/hostname"), "\x00..\x1F"); - return exec("grep \"gravity.list\" /var/log/pihole.log | grep -v \"pi.hole\" | grep -v \" read \" | grep -v -c \"".$hostname."\""); + return exec("grep \"gravity.list\" /var/log/pihole.log | grep -c \" is \""); } function getForwards(\SplFileObject $log) { From a30d8918c445e83e17bbc6e19580a7719792c49d Mon Sep 17 00:00:00 2001 From: DL6ER Date: Mon, 19 Dec 2016 11:43:59 +0100 Subject: [PATCH 13/63] Removed preg_replace --- data.php | 1 - 1 file changed, 1 deletion(-) diff --git a/data.php b/data.php index 57d8aa4f..b82dfa8f 100644 --- a/data.php +++ b/data.php @@ -282,7 +282,6 @@ $lines = []; $hostname = trim(file_get_contents("/etc/hostname"), "\x00..\x1F"); foreach ($log as $line) { - $line = preg_replace('/ {2,}/', ' ', $line); $exploded = explode(" ", $line); if(count($exploded) == 8) { // Structure of data is currently like: From 2d7ef8fd9a2be4aa619fc4854a5fd5f552965885 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Mon, 19 Dec 2016 11:46:25 +0100 Subject: [PATCH 14/63] == to === --- data.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data.php b/data.php index b82dfa8f..6b9acde9 100644 --- a/data.php +++ b/data.php @@ -299,7 +299,7 @@ $list = $exploded[4]; $is = $exploded[6]; // Consider only gravity.list as DNS source (not e.g. hostname.list) - if(substr($list, strlen($list) - 12, 12) == "gravity.list" && $is === "is") { + if(substr($list, strlen($list) - 12, 12) === "gravity.list" && $is === "is") { $lines[] = $line; }; } From c04c8f93a0d21586825301fc9cfefda1fefac46c Mon Sep 17 00:00:00 2001 From: DL6ER Date: Mon, 19 Dec 2016 11:56:06 +0100 Subject: [PATCH 15/63] Don't need to get $hostname anymore --- data.php | 1 - 1 file changed, 1 deletion(-) diff --git a/data.php b/data.php index 6b9acde9..1d163c67 100644 --- a/data.php +++ b/data.php @@ -280,7 +280,6 @@ function getBlockedQueries(\SplFileObject $log) { $log->rewind(); $lines = []; - $hostname = trim(file_get_contents("/etc/hostname"), "\x00..\x1F"); foreach ($log as $line) { $exploded = explode(" ", $line); if(count($exploded) == 8) { From 10ef50a6eb0fdf94d2a41b08cd186970a19a94d4 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Mon, 19 Dec 2016 11:59:09 +0100 Subject: [PATCH 16/63] Removed another $hostname = ... --- data.php | 1 - 1 file changed, 1 deletion(-) diff --git a/data.php b/data.php index 1d163c67..65d0a7aa 100644 --- a/data.php +++ b/data.php @@ -307,7 +307,6 @@ } function countBlockedQueries() { - $hostname = trim(file_get_contents("/etc/hostname"), "\x00..\x1F"); return exec("grep \"gravity.list\" /var/log/pihole.log | grep -c \" is \""); } From 815c4a7173fb83619d81a8a4c54347193060bd72 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Tue, 20 Dec 2016 23:23:41 +0100 Subject: [PATCH 17/63] make function getBlockedQueries(\SplFileObject $log) compatible with extra logging format of dnsmasq --- data.php | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/data.php b/data.php index 65d0a7aa..e08b1ac0 100644 --- a/data.php +++ b/data.php @@ -282,7 +282,7 @@ $lines = []; foreach ($log as $line) { $exploded = explode(" ", $line); - if(count($exploded) == 8) { + if(count($exploded) == 8 || count($exploded) == 10) { // Structure of data is currently like: // Array // ( @@ -295,8 +295,22 @@ // [6] => is // [7] => ip.of.pi.hole // ) - $list = $exploded[4]; - $is = $exploded[6]; + // with extra logging enabled + // Array + // ( + // [0] => Dec + // [1] => 19 + // [2] => 11:21:51 + // [3] => dnsmasq[2584]: + // [4] => 1 (identifier) + // [5] => 1.2.3.4/12345 + // [6] => /etc/pihole/gravity.list + // [7] => doubleclick.com + // [8] => is + // [9] => ip.of.pi.hole + // ) + $list = $exploded[count($exploded)-4]; + $is = $exploded[count($exploded)-2]; // Consider only gravity.list as DNS source (not e.g. hostname.list) if(substr($list, strlen($list) - 12, 12) === "gravity.list" && $is === "is") { $lines[] = $line; From dfa2f071a912b50bddd8dba2389e830d6b59372e Mon Sep 17 00:00:00 2001 From: DL6ER Date: Wed, 21 Dec 2016 13:35:34 +0100 Subject: [PATCH 18/63] 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 b867a273..6eb68715 100644 --- a/scripts/pi-hole/php/data.php +++ b/scripts/pi-hole/php/data.php @@ -295,7 +295,7 @@ $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 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 19/63] 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 | 55 +++++++++++++++++------------------- 1 file changed, 26 insertions(+), 29 deletions(-) diff --git a/scripts/pi-hole/php/data.php b/scripts/pi-hole/php/data.php index 6eb68715..1957c6fc 100644 --- a/scripts/pi-hole/php/data.php +++ b/scripts/pi-hole/php/data.php @@ -235,7 +235,7 @@ 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 @@ 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]; + $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, - "" - )); - } + 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, + "" + )); } } } From 623ef322e44e1d73affbc122655cb956beb4d7ba Mon Sep 17 00:00:00 2001 From: DL6ER Date: Wed, 21 Dec 2016 20:45:02 +0100 Subject: [PATCH 20/63] Add support for port != 80 --- php/auth.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/php/auth.php b/php/auth.php index 1c8a4fe2..7972480b 100644 --- a/php/auth.php +++ b/php/auth.php @@ -33,8 +33,16 @@ function check_cors() { // Since the Host header is easily manipulated, we can only check if it's wrong and can't use it // to validate that the client is authorized, only unauthorized. - if(isset($_SERVER['HTTP_HOST']) && !in_array("http://".$_SERVER['HTTP_HOST'], $AUTHORIZED_HOSTNAMES)) { - log_and_die("Failed Host Check: " . $_SERVER['HTTP_HOST'] .' vs '. join(', ', $AUTHORIZED_HOSTNAMES)); + $server_host = $_SERVER['HTTP_HOST']; + + // If HTTP_HOST contains a non-standard port (!= 80) we have to strip the port + if(strpos($server_host,":")) + { + $server_host = parse_url($_SERVER['HTTP_HOST'], PHP_URL_HOST); + } + + if(isset($_SERVER['HTTP_HOST']) && !in_array("http://".$server_host, $AUTHORIZED_HOSTNAMES)) { + log_and_die("Failed Host Check: " . $server_host .' vs '. join(', ', $AUTHORIZED_HOSTNAMES)); } if(isset($_SERVER['HTTP_ORIGIN'])) { From a0554e985938c4fb0046966b4af9f01a70c6d882 Mon Sep 17 00:00:00 2001 From: Mcat12 Date: Wed, 21 Dec 2016 16:39:36 -0500 Subject: [PATCH 21/63] Handle no IPv4 address when guessing initial DHCP --- settings.php | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/settings.php b/settings.php index 6f404552..90abc485 100644 --- a/settings.php +++ b/settings.php @@ -106,10 +106,17 @@ { $DHCP = false; // Try to guess initial settings - $DHCPdomain = explode(".",$piHoleIPv4); - $DHCPstart = $DHCPdomain[0].".".$DHCPdomain[1].".".$DHCPdomain[2].".201"; - $DHCPend = $DHCPdomain[0].".".$DHCPdomain[1].".".$DHCPdomain[2].".251"; - $DHCProuter = $DHCPdomain[0].".".$DHCPdomain[1].".".$DHCPdomain[2].".1"; + if($piHOleIPv4 !== "unknown") { + $DHCPdomain = explode(".",$piHoleIPv4); + $DHCPstart = $DHCPdomain[0].".".$DHCPdomain[1].".".$DHCPdomain[2].".201"; + $DHCPend = $DHCPdomain[0].".".$DHCPdomain[1].".".$DHCPdomain[2].".251"; + $DHCProuter = $DHCPdomain[0].".".$DHCPdomain[1].".".$DHCPdomain[2].".1"; + } + else { + $DHCPstart = "0.0.0.0"; + $DHCPend = "0.0.0.0"; + $DHCProuter = "0.0.0.0"; + } } if(isset($setupVars["PIHOLE_DOMAIN"])){ $piHoleDomain = $setupVars["PIHOLE_DOMAIN"]; From 688f7dd5c75d979d6f8290a87d9803fe0ad5c862 Mon Sep 17 00:00:00 2001 From: Mcat12 Date: Wed, 21 Dec 2016 17:53:46 -0500 Subject: [PATCH 22/63] Fix typo --- settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.php b/settings.php index 90abc485..4d0a7f4b 100644 --- a/settings.php +++ b/settings.php @@ -106,7 +106,7 @@ { $DHCP = false; // Try to guess initial settings - if($piHOleIPv4 !== "unknown") { + if($piHoleIPv4 !== "unknown") { $DHCPdomain = explode(".",$piHoleIPv4); $DHCPstart = $DHCPdomain[0].".".$DHCPdomain[1].".".$DHCPdomain[2].".201"; $DHCPend = $DHCPdomain[0].".".$DHCPdomain[1].".".$DHCPdomain[2].".251"; From 765db730b6031ddf63b0178581b275cb1ec08023 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Wed, 21 Dec 2016 23:59:01 +0100 Subject: [PATCH 23/63] Empty suggestion instead of 0.0.0.0 --- settings.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/settings.php b/settings.php index 4d0a7f4b..2ae032ea 100644 --- a/settings.php +++ b/settings.php @@ -113,9 +113,9 @@ $DHCProuter = $DHCPdomain[0].".".$DHCPdomain[1].".".$DHCPdomain[2].".1"; } else { - $DHCPstart = "0.0.0.0"; - $DHCPend = "0.0.0.0"; - $DHCProuter = "0.0.0.0"; + $DHCPstart = ""; + $DHCPend = ""; + $DHCProuter = ""; } } if(isset($setupVars["PIHOLE_DOMAIN"])){ From 8e607916feefa4b8e43b18f69ac14a8faff6cfe7 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Thu, 22 Dec 2016 22:26:14 +0100 Subject: [PATCH 24/63] Fix small screen behavior --- index.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/index.php b/index.php index aae56b72..f89ba834 100644 --- a/index.php +++ b/index.php @@ -4,7 +4,7 @@ ?>
-
+
@@ -17,7 +17,7 @@
-
+
@@ -30,7 +30,7 @@
-
+
@@ -43,11 +43,11 @@
-
+
-

---

+

---

Domains Being Blocked

From d25213e729573c0c3d3ae3a68fefe424107b48d6 Mon Sep 17 00:00:00 2001 From: Promofaux Date: Thu, 22 Dec 2016 21:53:53 +0000 Subject: [PATCH 25/63] auto focus on password input --- php/loginpage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php/loginpage.php b/php/loginpage.php index f4abf4a0..a0366dfb 100644 --- a/php/loginpage.php +++ b/php/loginpage.php @@ -15,7 +15,7 @@
- +
From 0656526d434bd6e16a01e0e2c1918e00e6cb21b2 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Fri, 23 Dec 2016 12:49:54 +0100 Subject: [PATCH 26/63] Add blocking version of pihole.log tailing --- header.php | 6 ++++++ js/pihole/taillog.js | 30 ++++++++++++++++++++++++++++++ php/taillog.php | 23 +++++++++++++++++++++++ taillog.php | 16 ++++++++++++++++ 4 files changed, 75 insertions(+) create mode 100644 js/pihole/taillog.js create mode 100644 php/taillog.php create mode 100644 taillog.php diff --git a/header.php b/header.php index 39146967..eb5a0940 100644 --- a/header.php +++ b/header.php @@ -353,6 +353,12 @@ Query adlists + +
  • + + Tail pihole.log + +
    • diff --git a/taillog.php b/taillog.php new file mode 100644 index 00000000..fd328837 --- /dev/null +++ b/taillog.php @@ -0,0 +1,16 @@ + + +
    +

    Output the last lines of the pihole.log file (live)

    +
    + + + + + + + From 1009dba240148c46ccf69bcac97bde3e3b5bfa42 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Fri, 23 Dec 2016 13:39:29 +0100 Subject: [PATCH 27/63] 100% non-blocking using our awesome API --- api.php | 4 ++++ data.php | 27 ++++++++++++++++++++++++++ js/pihole/taillog.js | 45 ++++++++++++++++++++++---------------------- php/taillog.php | 23 ---------------------- taillog.php | 2 +- 5 files changed, 54 insertions(+), 47 deletions(-) delete mode 100644 php/taillog.php diff --git a/api.php b/api.php index 150dc9e2..7d2ee8e9 100644 --- a/api.php +++ b/api.php @@ -80,6 +80,10 @@ $data = array_merge($data, getGravity()); } + if (isset($_GET['tailLog'])) { + $data = array_merge($data, tailPiholeLog($_GET['tailLog'])); + } + function filterArray(&$inArray) { $outArray = array(); foreach ($inArray as $key=>$value) { diff --git a/data.php b/data.php index 5cc0fdfd..2e7ec397 100644 --- a/data.php +++ b/data.php @@ -293,6 +293,33 @@ return $allQueries; } + function tailPiholeLog($param) { + // Not using SplFileObject here, since direct + // usage of f-streams will be much faster for + // files as large as the pihole.log + global $logListName; + $file = fopen($logListName,"r"); + $offset = intval($param); + if($offset > 0) + { + // Seeks on the file pointer where we want to continue reading is known + fseek($file, $offset); + $lines = []; + while (!feof($file)) { + array_push($lines,fgets($file)); + } + return ["offset" => ftell($file), "lines" => $lines]; + } + else + { + // Locate the current position of the file read/write pointer + fseek($file, -1, SEEK_END); + // Add one to skip the very last "\n" in the log file + return ["offset" => ftell($file)+1]; + } + fclose($file); + } + /******** Private Members ********/ function gravityCount() { global $gravityListName,$blackListFile; diff --git a/js/pihole/taillog.js b/js/pihole/taillog.js index 0ae63f41..e6682761 100644 --- a/js/pihole/taillog.js +++ b/js/pihole/taillog.js @@ -1,30 +1,29 @@ -var source; -function eventsource() { - var ta = $("#output"); - source = new EventSource("php/taillog.php"); +var offset, timer, pre; - ta.html(""); - ta.show(); +// Check every 200msec for fresh data +var interval = 200; - source.addEventListener("message", function(e) { - if(e.data.indexOf("Ctrl-C") === -1) - { - // Hide the "Press Ctrl-C to exit" message - ta.append(e.data); - } - - }, false); - - // Will be called when script has finished - source.addEventListener("error", function(e) { - source.close(); - }, false); +// Function that asks the API for new data +function reloadData(){ + clearTimeout(timer); + $.getJSON("api.php?tailLog="+offset, function (data) + { + offset = data["offset"]; + pre.append(data["lines"]); + console.log(offset); + }); + timer = setTimeout(reloadData, interval); } $(function(){ - eventsource(); + // Get offset at first loading of page + $.getJSON("api.php?tailLog", function (data) + { + offset = data["offset"]; + console.log(offset); + }); + pre = $("#output"); + // Trigger function that looks for new data + reloadData(); }); -$(window).unload(function(){ - source.close(); -}); diff --git a/php/taillog.php b/php/taillog.php deleted file mode 100644 index 210397d4..00000000 --- a/php/taillog.php +++ /dev/null @@ -1,23 +0,0 @@ - diff --git a/taillog.php b/taillog.php index fd328837..10800fc1 100644 --- a/taillog.php +++ b/taillog.php @@ -6,7 +6,7 @@

    Output the last lines of the pihole.log file (live)

    - +
    
 
 
Date: Fri, 23 Dec 2016 13:53:18 +0100
Subject: [PATCH 28/63] Add auto scrolling feature

---
 js/pihole/taillog.js | 39 +++++++++++++++++++++++++--------------
 taillog.php          |  2 ++
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/js/pihole/taillog.js b/js/pihole/taillog.js
index e6682761..0324c395 100644
--- a/js/pihole/taillog.js
+++ b/js/pihole/taillog.js
@@ -1,29 +1,40 @@
-var offset, timer, pre;
+var offset, timer, pre, scrolling = true;
 
 // Check every 200msec for fresh data
 var interval = 200;
 
 // Function that asks the API for new data
 function reloadData(){
-  clearTimeout(timer);
-  $.getJSON("api.php?tailLog="+offset, function (data)
+    clearTimeout(timer);
+    $.getJSON("api.php?tailLog="+offset, function (data)
     {
-      offset = data["offset"];
-      pre.append(data["lines"]);
-      console.log(offset);
+        offset = data["offset"];
+        pre.append(data["lines"]);
     });
-  timer = setTimeout(reloadData, interval);
+
+    if(scrolling)
+    {
+        window.scrollTo(0,document.body.scrollHeight);
+    }
+    timer = setTimeout(reloadData, interval);
 }
 
 $(function(){
-  // Get offset at first loading of page
-  $.getJSON("api.php?tailLog", function (data)
+    // Get offset at first loading of page
+    $.getJSON("api.php?tailLog", function (data)
     {
-      offset = data["offset"];
-      console.log(offset);
+        offset = data["offset"];
     });
-  pre = $("#output");
-  // Trigger function that looks for new data
-  reloadData();
+    pre = $("#output");
+    // Trigger function that looks for new data
+    reloadData();
 });
 
+$('#chk1').click(function() {
+    $("#chk2").prop("checked",this.checked);
+    scrolling = this.checked;
+});
+$('#chk2').click(function() {
+    $("#chk1").prop("checked",this.checked);
+    scrolling = this.checked;
+});
diff --git a/taillog.php b/taillog.php
index 10800fc1..6ce2c4be 100644
--- a/taillog.php
+++ b/taillog.php
@@ -6,7 +6,9 @@
     
    Output the last lines of the pihole.log file (live)
    
 
    
 
+
    
 
    
+
    
 
 
Date: Fri, 23 Dec 2016 13:55:29 +0100
Subject: [PATCH 29/63] Adjusted wording slightly

---
 taillog.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/taillog.php b/taillog.php
index 6ce2c4be..16b46801 100644
--- a/taillog.php
+++ b/taillog.php
@@ -6,9 +6,9 @@
     
    Output the last lines of the pihole.log file (live)
    
 
    
 
-
    
+
    
 
    
-
    
+
    
 
 
Date: Fri, 23 Dec 2016 13:56:24 +0100
Subject: [PATCH 30/63] Strings must use doublequote.

---
 js/pihole/taillog.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/pihole/taillog.js b/js/pihole/taillog.js
index 0324c395..00cbfb15 100644
--- a/js/pihole/taillog.js
+++ b/js/pihole/taillog.js
@@ -30,11 +30,11 @@ $(function(){
     reloadData();
 });
 
-$('#chk1').click(function() {
+$("#chk1").click(function() {
     $("#chk2").prop("checked",this.checked);
     scrolling = this.checked;
 });
-$('#chk2').click(function() {
+$("#chk2").click(function() {
     $("#chk1").prop("checked",this.checked);
     scrolling = this.checked;
 });

From f3cc33a140ced7e3ee6831ddbb2a5019eab7b520 Mon Sep 17 00:00:00 2001
From: DL6ER 
Date: Fri, 23 Dec 2016 14:03:09 +0100
Subject: [PATCH 31/63] Fixed one comment

---
 header.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/header.php b/header.php
index eb5a0940..1526ce24 100644
--- a/header.php
+++ b/header.php
@@ -353,7 +353,7 @@
                          Query adlists
                     
                 
-                
+                
                 
  • 
                     
                          Tail pihole.log

From dc95f8db56a74c315dfb844c52f492a9ec6dfeb9 Mon Sep 17 00:00:00 2001
From: DL6ER 
Date: Fri, 23 Dec 2016 14:12:40 +0100
Subject: [PATCH 32/63] Add Tools submenu

---
 header.php | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/header.php b/header.php
index 39146967..beb265b0 100644
--- a/header.php
+++ b/header.php
@@ -341,17 +341,27 @@
                          Blacklist
                     
                 
    • 
-                
-                
  • 
-                    
-                         Update Lists
-                    
-                
    • 
-                
-                
  • 
-                    
-                         Query adlists
-                    
+                
  • 
+                  
+                     Tools
+                    
+                      
+                    
+                  
+                  
                 
    • 
                 
                 
Date: Fri, 23 Dec 2016 14:17:30 +0100
Subject: [PATCH 33/63] Add active class to currently active main nav entry

---
 header.php | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/header.php b/header.php
index beb265b0..3b7b9e8c 100644
--- a/header.php
+++ b/header.php
@@ -314,34 +314,48 @@
                 
    
             
    
             
+