Merge pull request #1638 from pi-hole/release/v5.2

Pi-hole Web 5.2 Release PR
pi-hole · Nov 28, 2020 · 2c2d9f5 · 2c2d9f5
2 parents a03d1bd + 68351a3
commit 2c2d9f5
Show file tree

Hide file tree

Showing 54 changed files with 1,935 additions and 929 deletions.
diff --git a/api_FTL.php b/api_FTL.php
@@ -288,6 +288,11 @@
 			// Get specific domain only
 			sendRequestFTL("getallqueries-domain ".$_GET['domain']);
 		}
+		else if(isset($_GET['client']) && (isset($_GET['type']) && $_GET['type'] === "blocked"))
+		{
+			// Get specific client only
+			sendRequestFTL("getallqueries-client-blocked ".$_GET['client']);
+		}
 		else if(isset($_GET['client']))
 		{
 			// Get specific client only
@@ -411,6 +416,13 @@
 		$data = array_merge($data, $result);
 	}
 
+	if (isset($_GET['delete_lease']) && $auth)
+	{
+		sendRequestFTL("delete-lease ".$_GET['delete_lease']);
+		$return = getResponseFTL();
+		$data["delete_lease"] = $return[0];
+	}
+
 	disconnectFTL();
 }
 ?>
diff --git a/api_db.php b/api_db.php
@@ -62,18 +62,27 @@ function resolveHostname($clientip, $printIP)
 
 	while($results !== false && $res = $results->fetchArray(SQLITE3_ASSOC))
 	{
-		$id = $res["id"];
-		// Empty array for holding the IP addresses
+		$id = intval($res["id"]);
+
+		// Get IP addresses and host names for this device
 		$res["ip"] = array();
-		// Get IP addresses for this device
-		$network_addresses = $db->query("SELECT ip FROM network_addresses WHERE network_id = $id ORDER BY lastSeen DESC");
-		while($network_addresses !== false && $ip = $network_addresses->fetchArray(SQLITE3_ASSOC))
-			array_push($res["ip"],$ip["ip"]);
-		// UTF-8 encode host name and vendor
-		$res["name"] = utf8_encode($res["name"]);
+		$res["name"] = array();
+		$network_addresses = $db->query("SELECT ip,name FROM network_addresses WHERE network_id = $id ORDER BY lastSeen DESC");
+		while($network_addresses !== false && $network_address = $network_addresses->fetchArray(SQLITE3_ASSOC))
+		{
+			array_push($res["ip"],$network_address["ip"]);
+			if($network_address["name"] !== null)
+				array_push($res["name"],utf8_encode($network_address["name"]));
+			else
+				array_push($res["name"],"");
+		}
+		$network_addresses->finalize();
+
+		// UTF-8 encode vendor
 		$res["macVendor"] = utf8_encode($res["macVendor"]);
 		array_push($network, $res);
 	}
+	$results->finalize();
 
 	$data = array_merge($data, array('network' => $network));
 }
@@ -85,7 +94,7 @@ function resolveHostname($clientip, $printIP)
 	{
 		$from = intval($_GET["from"]);
 		$until = intval($_GET["until"]);
-		$dbquery = "SELECT timestamp, type, domain, client, status FROM queries WHERE timestamp >= :from AND timestamp <= :until ";
+		$dbquery = "SELECT timestamp, type, domain, client, status, forward FROM queries WHERE timestamp >= :from AND timestamp <= :until ";
 		if(isset($_GET["types"]))
 		{
 			$types = $_GET["types"];
@@ -144,8 +153,8 @@ function resolveHostname($clientip, $printIP)
 						$query_type = "UNKN";
 						break;
 				}
-				// array:        time     type         domain                client           status
-				$allQueries[] = [$row[0], $query_type, utf8_encode($row[2]), utf8_encode($c), $row[4]];
+				// array:        time     type         domain                client           status   upstream destination
+				$allQueries[] = [$row[0], $query_type, utf8_encode($row[2]), utf8_encode($c), $row[4], utf8_encode($row[5])];
 			}
 	}
 	$result = array('data' => $allQueries);

diff --git a/auditlog.php b/auditlog.php
@@ -72,8 +72,8 @@
 </div>
 <!-- /.row -->
 
-<script src="scripts/pi-hole/js/utils.js"></script>
-<script src="scripts/pi-hole/js/auditlog.js"></script>
+<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
+<script src="scripts/pi-hole/js/auditlog.js?v=<?=$cacheVer?>"></script>
 
 <?php
     require "scripts/pi-hole/php/footer.php";

diff --git a/cname_records.php b/cname_records.php
@@ -0,0 +1,97 @@
+<?php /*
+*    Pi-hole: A black hole for Internet advertisements
+*    (c) 2017 Pi-hole, LLC (https://pi-hole.net)
+*    Network-wide ad blocking via your own hardware.
+*
+*    This file is copyright under the latest version of the EUPL.
+*    Please see LICENSE file for your rights under this license. */
+    require "scripts/pi-hole/php/header.php";
+
+?>
+
+<!-- Title -->
+<div class="page-header">
+    <h1>Local CNAME Records</h1>
+    <small>On this page, you can add CNAME records.</small>
+</div>
+
+<!-- Domain Input -->
+<div class="row">
+    <div class="col-md-12">
+        <div class="box">
+            <!-- /.box-header -->
+            <div class="box-header with-border">
+                <h3 class="box-title">
+                    Add a new CNAME record
+                </h3>
+            </div>
+            <!-- /.box-header -->
+            <div class="box-body">
+                <div class="row">
+                    <div class="form-group col-md-6">
+                        <label for="domain">Domain:</label>
+                        <input id="domain" type="url" class="form-control" placeholder="Add a domain (example.com or sub.example.com)" autocomplete="off" spellcheck="false" autocapitalize="none" autocorrect="off">
+                    </div>
+                    <div class="form-group col-md-6">
+                        <label for="target">Target Domain:</label>
+                        <input id="target" type="url" class="form-control" placeholder="Associated Target Domain" autocomplete="off" spellcheck="false" autocapitalize="none" autocorrect="off">
+                    </div>
+                </div>
+            </div>
+            <div class="box-footer clearfix">
+                <button type="button" id="btnAdd" class="btn btn-primary pull-right">Add</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!-- Alerts -->
+<div id="alInfo" class="alert alert-info alert-dismissible fade in" role="alert" hidden>
+    <button type="button" class="close" data-hide="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    Updating CNAME records...
+</div>
+<div id="alSuccess" class="alert alert-success alert-dismissible fade in" role="alert" hidden>
+    <button type="button" class="close" data-hide="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    Success! The list will refresh.
+</div>
+<div id="alFailure" class="alert alert-danger alert-dismissible fade in" role="alert" hidden>
+    <button type="button" class="close" data-hide="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    Failure! Something went wrong, see output below:<br/><br/><pre><span id="err"></span></pre>
+</div>
+<div id="alWarning" class="alert alert-warning alert-dismissible fade in" role="alert" hidden>
+    <button type="button" class="close" data-hide="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    At least one domain was already present, see output below:<br/><br/><pre><span id="warn"></span></pre>
+</div>
+<div class="row">
+    <div class="col-md-12">
+        <div class="box" id="recent-queries">
+            <div class="box-header with-border">
+                <h3 class="box-title">
+                    List of local CNAME records
+                </h3>
+            </div>
+            <!-- /.box-header -->
+            <div class="box-body">
+                <table id="customCNAMETable" class="table table-striped table-bordered" width="100%">
+                    <thead>
+                    <tr>
+                        <th>Domain</th>
+                        <th>Target</th>
+                        <th>Action</th>
+                    </tr>
+                    </thead>
+                </table>
+                <button type="button" id="resetButton" class="btn btn-default btn-sm text-red hidden">Clear Filters</button>
+            </div>
+            <!-- /.box-body -->
+        </div>
+        <!-- /.box -->
+    </div>
+</div>
+
+<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
+<script src="scripts/pi-hole/js/customcname.js?v=<?=$cacheVer?>"></script>
+
+<?php
+require "scripts/pi-hole/php/footer.php";
+?>
diff --git a/db_graph.php b/db_graph.php
@@ -67,9 +67,9 @@
   </div>
 </div>
 
-<script src="scripts/vendor/daterangepicker.min.js"></script>
-<script src="scripts/pi-hole/js/utils.js"></script>
-<script src="scripts/pi-hole/js/db_graph.js"></script>
+<script src="scripts/vendor/daterangepicker.min.js?v=<?=$cacheVer?>"></script>
+<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
+<script src="scripts/pi-hole/js/db_graph.js?v=<?=$cacheVer?>"></script>
 
 <?php
     require "scripts/pi-hole/php/footer.php";

diff --git a/db_lists.php b/db_lists.php
@@ -139,9 +139,9 @@
     <!-- /.col -->
 </div>
 
-<script src="scripts/vendor/daterangepicker.min.js"></script>
-<script src="scripts/pi-hole/js/utils.js"></script>
-<script src="scripts/pi-hole/js/db_lists.js"></script>
+<script src="scripts/vendor/daterangepicker.min.js?v=<?=$cacheVer?>"></script>
+<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
+<script src="scripts/pi-hole/js/db_lists.js?v=<?=$cacheVer?>"></script>
 
 <?php
     require "scripts/pi-hole/php/footer.php";

diff --git a/db_queries.php b/db_queries.php
@@ -45,6 +45,7 @@
         <div class="col-md-3">
             <div><input type="checkbox" id="type_forwarded" checked><label for="type_forwarded">Permitted: forwarded</label><br></div>
             <div><input type="checkbox" id="type_cached" checked><label for="type_cached">Permitted: cached</label></div>
+            <div><input type="checkbox" id="type_retried" checked><label for="type_retried">Permitted: Retried</label></div>
         </div>
         <div class="col-md-3">
             <div><input type="checkbox" id="type_gravity" checked><label for="type_gravity">Blocked: gravity</label><br></div>
@@ -122,6 +123,40 @@
     <!-- ./col -->
 </div>
 
+<!-- Alert Modal -->
+<div id="alertModal" class="modal fade" role="dialog" data-backdrop="static" data-keyboard="false">
+    <div class="vertical-alignment-helper">
+        <div class="modal-dialog vertical-align-center">
+            <div class="modal-content">
+                <div class="modal-body text-center">
+                    <span class="fa-stack fa-2x" style="margin-bottom: 10px">
+                        <div class="alProcessing">
+                            <i class="fa-stack-2x alSpinner"></i>
+                        </div>
+                        <div class="alSuccess" style="display: none">
+                            <i class="fa fa-circle fa-stack-2x text-green"></i>
+                            <i class="fa fa-check fa-stack-1x fa-inverse"></i>
+                        </div>
+                        <div class="alFailure" style="display: none">
+                            <i class="fa fa-circle fa-stack-2x text-red"></i>
+                            <i class="fa fa-times fa-stack-1x fa-inverse"></i>
+                        </div>
+                    </span>
+                    <div class="alProcessing">Adding <span id="alDomain"></span> to the <span id="alList"></span>...</div>
+                    <div class="alSuccess text-bold text-green" style="display: none"><span id="alDomain"></span> successfully added to the <span id="alList"></span></div>
+                    <div class="alFailure text-bold text-red" style="display: none">
+                        <span id="alNetErr">Timeout or Network Connection Error!</span>
+                        <span id="alCustomErr"></span>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
 <div class="row">
     <div class="col-md-12">
       <div class="box" id="recent-queries">
@@ -159,9 +194,10 @@
     </div>
 </div>
 <!-- /.row -->
-<script src="scripts/pi-hole/js/ip-address-sorting.js"></script>
-<script src="scripts/vendor/daterangepicker.min.js"></script>
-<script src="scripts/pi-hole/js/db_queries.js"></script>
+<script src="scripts/pi-hole/js/ip-address-sorting.js?v=<?=$cacheVer?>"></script>
+<script src="scripts/vendor/daterangepicker.min.js?v=<?=$cacheVer?>"></script>
+<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
+<script src="scripts/pi-hole/js/db_queries.js?v=<?=$cacheVer?>"></script>
 
 <?php
     require "scripts/pi-hole/php/footer.php";

diff --git a/debug.php b/debug.php
@@ -19,7 +19,7 @@
 <button type="button" id="debugBtn" class="btn btn-lg btn-primary btn-block">Generate debug log</button>
 <pre id="output" style="width: 100%; height: 100%;" hidden></pre>
 
-<script src="scripts/pi-hole/js/debug.js"></script>
+<script src="scripts/pi-hole/js/debug.js?v=<?=$cacheVer?>"></script>
 
 <?php
     require "scripts/pi-hole/php/footer.php";

diff --git a/dns_records.php b/dns_records.php
@@ -89,9 +89,9 @@
     </div>
 </div>
 
-<script src="scripts/pi-hole/js/utils.js"></script>
-<script src="scripts/pi-hole/js/ip-address-sorting.js"></script>
-<script src="scripts/pi-hole/js/customdns.js"></script>
+<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
+<script src="scripts/pi-hole/js/ip-address-sorting.js?v=<?=$cacheVer?>"></script>
+<script src="scripts/pi-hole/js/customdns.js?v=<?=$cacheVer?>"></script>
 
 <?php
 require "scripts/pi-hole/php/footer.php";

diff --git a/gravity.php b/gravity.php
@@ -25,7 +25,7 @@
 <button type="button" id="gravityBtn" class="btn btn-lg btn-primary btn-block">Update</button>
 <pre id="output" style="width: 100%; height: 100%;" hidden></pre>
 
-<script src="scripts/pi-hole/js/gravity.js"></script>
+<script src="scripts/pi-hole/js/gravity.js?v=<?=$cacheVer?>"></script>
 
 <?php
     require "scripts/pi-hole/php/footer.php";

diff --git a/groups-adlists.php b/groups-adlists.php
@@ -77,10 +77,10 @@
     </div>
 </div>
 
-<script src="scripts/vendor/bootstrap-select.min.js"></script>
-<script src="scripts/vendor/bootstrap-toggle.min.js"></script>
-<script src="scripts/pi-hole/js/utils.js"></script>
-<script src="scripts/pi-hole/js/groups-adlists.js"></script>
+<script src="scripts/vendor/bootstrap-select.min.js?v=<?=$cacheVer?>"></script>
+<script src="scripts/vendor/bootstrap-toggle.min.js?v=<?=$cacheVer?>"></script>
+<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
+<script src="scripts/pi-hole/js/groups-adlists.js?v=<?=$cacheVer?>"></script>
 
 <?php
 require "scripts/pi-hole/php/footer.php";

diff --git a/groups-clients.php b/groups-clients.php
@@ -30,14 +30,25 @@
                         <label for="select">Known clients:</label>
                         <select id="select" class="form-control" placeholder="">
                             <option disabled selected>Loading...</option>
-                        </select><br>
-                        <input id="ip-custom" type="text" class="form-control" disabled placeholder="Client IP address (IPv4 or IPv6, CIDR subnetting available, optional)" autocomplete="off" spellcheck="false" autocapitalize="none" autocorrect="off">
+                        </select>
                     </div>
                     <div class="form-group col-md-6">
                         <label for="new_comment">Comment:</label>
                         <input id="new_comment" type="text" class="form-control" placeholder="Client description (optional)">
                     </div>
                 </div>
+                <div class="row">
+                    <div class="col-md-12">
+                        <p>You can select an existing client or add a custom one by typing into the field above and confirming your entry with <kbd>&#x23CE;</kbd>.</p>
+                        <p>Clients may be described either by their IP addresses (IPv4 and IPv6 are supported),
+                           IP subnets (CIDR notation, like <code>192.168.2.0/24</code>),
+                           their MAC addresses (like <code>12:34:56:78:9A:BC</code>),
+                           by their hostnames (like <code>localhost</code>), or by the interface they are connected to (prefaced with a colon, like <code>:eth0</code>).</p>
+                        <p>Note that client recognition by IP addresses (incl. subnet ranges) are prefered over MAC address, host name or interface recognition as
+                           the two latter will only be available after some time.
+                           Furthermore, MAC address recognition only works for devices at most one networking hop away from your Pi-hole.</p>
+                    </div>
+                </div>
             </div>
             <div class="box-footer clearfix">
                 <button type="button" id="btnAdd" class="btn btn-primary pull-right">Add</button>
@@ -59,7 +70,7 @@
                     <thead>
                     <tr>
                         <th>ID</th>
-                        <th>IP address</th>
+                        <th title="Acceptable values are: IP address, subnet (CIDR notation), MAC address (AA:BB:CC:DD:EE:FF format) or host names.">Client</th>
                         <th>Comment</th>
                         <th>Group assignment</th>
                         <th>Action</th>
@@ -74,11 +85,11 @@
     </div>
 </div>
 
-<script src="scripts/vendor/bootstrap-select.min.js"></script>
-<script src="scripts/vendor/bootstrap-toggle.min.js"></script>
-<script src="scripts/pi-hole/js/ip-address-sorting.js"></script>
-<script src="scripts/pi-hole/js/utils.js"></script>
-<script src="scripts/pi-hole/js/groups-clients.js"></script>
+<script src="scripts/vendor/bootstrap-select.min.js?v=<?=$cacheVer?>"></script>
+<script src="scripts/vendor/bootstrap-toggle.min.js?v=<?=$cacheVer?>"></script>
+<script src="scripts/pi-hole/js/ip-address-sorting.js?v=<?=$cacheVer?>"></script>
+<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
+<script src="scripts/pi-hole/js/groups-clients.js?v=<?=$cacheVer?>"></script>
 
 <?php
 require "scripts/pi-hole/php/footer.php";

diff --git a/groups-domains.php b/groups-domains.php
@@ -138,10 +138,10 @@
     </div>
 </div>
 
-<script src="scripts/vendor/bootstrap-select.min.js"></script>
-<script src="scripts/vendor/bootstrap-toggle.min.js"></script>
-<script src="scripts/pi-hole/js/utils.js"></script>
-<script src="scripts/pi-hole/js/groups-domains.js"></script>
+<script src="scripts/vendor/bootstrap-select.min.js?v=<?=$cacheVer?>"></script>
+<script src="scripts/vendor/bootstrap-toggle.min.js?v=<?=$cacheVer?>"></script>
+<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
+<script src="scripts/pi-hole/js/groups-domains.js?v=<?=$cacheVer?>"></script>
 
 <?php
 require "scripts/pi-hole/php/footer.php";