Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-02-15 07:25:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reverse logic of in/exlcudin queries from long-term database and rename queryType => statusType

Browse Source 
Signed-off-by: Christian König <ckoenig@posteo.de>
This commit is contained in:
Christian König
2022-09-08 15:30:14 +02:00
parent 5cf3c49587
commit 58f8738907
2 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
api_db.php
View File

@@ -76,17 +76,18 @@ if (isset($_GET['getAllQueries']) && $auth) {
$dbquery .= ' status, reply_type, reply_time, dnssec';
$dbquery .= ' FROM query_storage q';
$dbquery .= ' WHERE timestamp >= :from AND timestamp <= :until ';
if (isset($_GET['types'])) {
$types = $_GET['types'];
if (preg_match('/^[0-9]+(?:,[0-9]+)*$/', $types) === 1) {
if (isset($_GET['status'])) {
// if some query status should be excluded
$status = $_GET['status'];
if (preg_match('/^[0-9]+(?:,[0-9]+)*$/', $status) === 1) {
// Append selector to DB query. The used regex ensures
// that only numbers, separated by commas are accepted
// to avoid code injection and other malicious things
// We accept only valid lists like "1,2,3"
// We reject ",2,3", "1,2," and similar arguments
$dbquery .= 'AND status IN ('.$types.') ';
$dbquery .= 'AND status NOT IN ('.$status.') ';
} else {
exit('Error. Selector types specified using an invalid format.');
exit('Error. Selector status specified using an invalid format.');
}
}
$dbquery .= 'ORDER BY timestamp ASC';