diff --git a/api_db.php b/api_db.php index 019fb7ac..51d59ba4 100644 --- a/api_db.php +++ b/api_db.php @@ -87,7 +87,6 @@ if(isset($_GET["network"]) && $auth) $data = array_merge($data, array('network' => $network)); } -$qtypes = ["A", "AAAA", "ANY", "SRV", "SOA", "PTR", "TXT", "NAPTR", "MX", "DS", "RRSIG", "DNSKEY", "NS", "OTHER", "SVCB", "HTTPS"]; if (isset($_GET['getAllQueries']) && $auth) { $allQueries = array(); @@ -121,17 +120,14 @@ if (isset($_GET['getAllQueries']) && $auth) if(!is_bool($results)) while ($row = $results->fetchArray()) { + // Try to resolve host name of this client $c = resolveHostname($row[3],false); // Convert query type ID to name - // Names taken from FTL's query type names - $qtype = intval($row[1]); - if($qtype > 0 && $qtype <= count($qtypes)) - $query_type = $qtypes[$qtype-1]; - else - $query_type = "TYPE".(intval($row[1]) - 100); + $query_type = getQueryTypeStr($row[1]); - // array: time type domain client status upstream destination + // Insert into array + // array: time type domain client status upstream destination $allQueries[] = [$row[0], $query_type, utf8_encode(str_replace("~"," ",$row[2])), utf8_encode($c), $row[4], utf8_encode($row[5])]; } } diff --git a/cname_records.php b/cname_records.php index 0e4e7e16..53dcdab5 100644 --- a/cname_records.php +++ b/cname_records.php @@ -40,7 +40,7 @@
Note: -

The target of a CNAME must be a domain that the Pi-hole already has in its cache or is authoritative for. This is an universal limitation of CNAME records.

+

The target of a CNAME must be a domain that the Pi-hole already has in its cache or is authoritative for. This is a universal limitation of CNAME records.

The reason for this is that Pi-hole will not send additional queries upstream when serving CNAME replies. As consequence, if you set a target that isn't already known, the reply to the client may be incomplete. Pi-hole just returns the information it knows at the time of the query. This results in certain limitations for CNAME targets, for instance, only active DHCP leases work as targets - mere DHCP leases aren't sufficient as they aren't (yet) valid DNS records.

Additionally, you can't CNAME external domains (bing.com to google.com) successfully as this could result in invalid SSL certificate errors when the target server does not serve content for the requested domain.

diff --git a/package-lock.json b/package-lock.json index 468b57cf..c9ffb94f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -174,6 +174,15 @@ } } }, + "@mdn/browser-compat-data": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-2.0.7.tgz", + "integrity": "sha512-GeeM827DlzFFidn1eKkMBiqXFD2oLsnZbaiGhByPl0vcapsRzUL+t9hDoov1swc9rB2jw64R+ihtzC8qOE9wXw==", + "dev": true, + "requires": { + "extend": "3.0.2" + } + }, "@mrmlnc/readdir-enhanced": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", @@ -640,42 +649,42 @@ "dev": true }, "autoprefixer": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.1.0.tgz", - "integrity": "sha512-0/lBNwN+ZUnb5su18NZo5MBIjDaq6boQKZcxwy86Gip/CmXA2zZqUoFQLCNAGI5P25ZWSP2RWdhDJ8osfKEjoQ==", + "version": "10.2.1", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.2.1.tgz", + "integrity": "sha512-dwP0UjyYvROUvtU+boBx8ff5pPWami1NGTrJs9YUsS/oZVbRAcdNHOOuXSA1fc46tgKqe072cVaKD69rvCc3QQ==", "dev": true, "requires": { - "browserslist": "^4.15.0", - "caniuse-lite": "^1.0.30001165", + "browserslist": "^4.16.1", + "caniuse-lite": "^1.0.30001173", "colorette": "^1.2.1", - "fraction.js": "^4.0.12", + "fraction.js": "^4.0.13", "normalize-range": "^0.1.2", "postcss-value-parser": "^4.1.0" }, "dependencies": { "browserslist": { - "version": "4.16.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.0.tgz", - "integrity": "sha512-/j6k8R0p3nxOC6kx5JGAxsnhc9ixaWJfYc+TNTzxg6+ARaESAvQGV7h0uNOB4t+pLQJZWzcrMxXOxjgsCj3dqQ==", + "version": "4.16.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.1.tgz", + "integrity": "sha512-UXhDrwqsNcpTYJBTZsbGATDxZbiVDsx6UjpmRUmtnP10pr8wAYr5LgFoEFw9ixriQH2mv/NX2SfGzE/o8GndLA==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001165", + "caniuse-lite": "^1.0.30001173", "colorette": "^1.2.1", - "electron-to-chromium": "^1.3.621", + "electron-to-chromium": "^1.3.634", "escalade": "^3.1.1", - "node-releases": "^1.1.67" + "node-releases": "^1.1.69" } }, "caniuse-lite": { - "version": "1.0.30001165", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001165.tgz", - "integrity": "sha512-8cEsSMwXfx7lWSUMA2s08z9dIgsnR5NAqjXP23stdsU3AUWkCr/rr4s4OFtHXn5XXr6+7kam3QFVoYyXNPdJPA==", + "version": "1.0.30001173", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001173.tgz", + "integrity": "sha512-R3aqmjrICdGCTAnSXtNyvWYMK3YtV5jwudbq0T7nN9k4kmE4CBuwPqyJ+KBzepSTh0huivV2gLbSMEzTTmfeYw==", "dev": true }, "electron-to-chromium": { - "version": "1.3.625", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.625.tgz", - "integrity": "sha512-CsLk/r0C9dAzVPa9QF74HIXduxaucsaRfqiOYvIv2PRhvyC6EOqc/KbpgToQuDVgPf3sNAFZi3iBu4vpGOwGag==", + "version": "1.3.635", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.635.tgz", + "integrity": "sha512-RRriZOLs9CpW6KTLmgBqyUdnY0QNqqWs0HOtuQGGEMizOTNNn1P7sGRBxARnUeLejOsgwjDyRqT3E/CSst02ZQ==", "dev": true }, "escalade": { @@ -685,9 +694,9 @@ "dev": true }, "node-releases": { - "version": "1.1.67", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.67.tgz", - "integrity": "sha512-V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg==", + "version": "1.1.69", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.69.tgz", + "integrity": "sha512-DGIjo79VDEyAnRlfSqYTsy+yoHd2IOjJiKUozD2MV2D85Vso6Bug56mb9tT/fY5Urt0iqk01H7x+llAruDR2zA==", "dev": true } } @@ -782,9 +791,9 @@ "dev": true }, "binary-extensions": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz", - "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", "dev": true }, "bn.js": { @@ -957,15 +966,16 @@ } }, "browserslist": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.13.0.tgz", - "integrity": "sha512-MINatJ5ZNrLnQ6blGvePd/QOz9Xtu+Ne+x29iQSCHfkU5BugKVJwZKn/iiL8UbpIpa3JhviKjz+XxMo0m2caFQ==", + "version": "4.16.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.1.tgz", + "integrity": "sha512-UXhDrwqsNcpTYJBTZsbGATDxZbiVDsx6UjpmRUmtnP10pr8wAYr5LgFoEFw9ixriQH2mv/NX2SfGzE/o8GndLA==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001093", - "electron-to-chromium": "^1.3.488", - "escalade": "^3.0.1", - "node-releases": "^1.1.58" + "caniuse-lite": "^1.0.30001173", + "colorette": "^1.2.1", + "electron-to-chromium": "^1.3.634", + "escalade": "^3.1.1", + "node-releases": "^1.1.69" } }, "buf-compare": { @@ -1079,16 +1089,10 @@ "quick-lru": "^4.0.1" } }, - "caniuse-db": { - "version": "1.0.30001099", - "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001099.tgz", - "integrity": "sha512-1vc6swTmt/DbbRNlLuC8PasWqL1rHJiV4P1r++glSgyu2joqBpRcyHaJFVk7Piwz9hqYNIgXoDHre1mcwnD6QQ==", - "dev": true - }, "caniuse-lite": { - "version": "1.0.30001099", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001099.tgz", - "integrity": "sha512-sdS9A+sQTk7wKoeuZBN/YMAHVztUfVnjDi4/UV3sDE8xoh7YR12hKW+pIdB3oqKGwr9XaFL2ovfzt9w8eUI5CA==", + "version": "1.0.30001173", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001173.tgz", + "integrity": "sha512-R3aqmjrICdGCTAnSXtNyvWYMK3YtV5jwudbq0T7nN9k4kmE4CBuwPqyJ+KBzepSTh0huivV2gLbSMEzTTmfeYw==", "dev": true }, "chalk": { @@ -1114,14 +1118,14 @@ } }, "chokidar": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz", - "integrity": "sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.0.tgz", + "integrity": "sha512-JgQM9JS92ZbFR4P90EvmzNpSGhpPBGBSj10PILeDyYFwp4h2/D9OM03wsJ4zW1fEp4ka2DGrnUeD7FuvQ2aZ2Q==", "dev": true, "requires": { "anymatch": "~3.1.1", "braces": "~3.0.2", - "fsevents": "~2.1.2", + "fsevents": "~2.3.1", "glob-parent": "~5.1.0", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", @@ -1307,9 +1311,9 @@ } }, "core-js": { - "version": "3.6.5", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz", - "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==", + "version": "3.8.2", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.8.2.tgz", + "integrity": "sha512-FfApuSRgrR6G5s58casCBd9M2k+4ikuu4wbW6pJyYU7bd9zvFc9qf7vr5xmrZOhT9nn+8uwlH1oRR9jTnFoA3A==", "dev": true }, "core-util-is": { @@ -1612,9 +1616,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.496", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.496.tgz", - "integrity": "sha512-TXY4mwoyowwi4Lsrq9vcTUYBThyc1b2hXaTZI13p8/FRhY2CTaq5lK+DVjhYkKiTLsKt569Xes+0J5JsVXFurQ==", + "version": "1.3.635", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.635.tgz", + "integrity": "sha512-RRriZOLs9CpW6KTLmgBqyUdnY0QNqqWs0HOtuQGGEMizOTNNn1P7sGRBxARnUeLejOsgwjDyRqT3E/CSst02ZQ==", "dev": true }, "elliptic": { @@ -1731,9 +1735,9 @@ } }, "escalade": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.0.1.tgz", - "integrity": "sha512-DR6NO3h9niOT+MZs7bjxlj2a1k+POu5RN8CLTPX2+i78bRi9eLe7+0zXgUHMnGXWybYcL61E9hGhPKqedy8tQA==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", "dev": true }, "escape-goat": { @@ -2096,18 +2100,18 @@ } }, "eslint-plugin-compat": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-compat/-/eslint-plugin-compat-3.8.0.tgz", - "integrity": "sha512-5CuWUSZXZkXLCQJBriEpndn/YWrvggDSHTpRJq++kR8GVcsWbTdp8Eh+nBA7JlrNi7ZJ/+kniOVXmn3bpnxuRA==", + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-compat/-/eslint-plugin-compat-3.9.0.tgz", + "integrity": "sha512-lt3l5PHFHVEYSZ5zijcoYvtQJPsBifRiH5N0Et57KwVu7l/yxmHhSG6VJiLMa/lXrg93Qu8049RNQOMn0+yJBg==", "dev": true, "requires": { + "@mdn/browser-compat-data": "^2.0.7", "ast-metadata-inferer": "^0.4.0", "browserslist": "^4.12.2", - "caniuse-db": "^1.0.30001090", + "caniuse-lite": "^1.0.30001166", "core-js": "^3.6.5", "find-up": "^4.1.0", "lodash.memoize": "4.1.2", - "mdn-browser-compat-data": "^1.0.28", "semver": "7.3.2" } }, @@ -2709,9 +2713,9 @@ "dev": true }, "fraction.js": { - "version": "4.0.12", - "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.0.12.tgz", - "integrity": "sha512-8Z1K0VTG4hzYY7kA/1sj4/r1/RWLBD3xwReT/RCrUCbzPszjNQCCsy3ktkU/eaEqX3MYa4pY37a52eiBlPMlhA==", + "version": "4.0.13", + "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.0.13.tgz", + "integrity": "sha512-E1fz2Xs9ltlUp+qbiyx9wmt2n9dRzPsS11Jtdb8D2o+cC7wr9xkkKsVKJuBX0ST+LVS+LhLO+SbLJNtfWcJvXA==", "dev": true }, "fragment-cache": { @@ -2742,9 +2746,9 @@ "dev": true }, "fsevents": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", - "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.1.tgz", + "integrity": "sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw==", "dev": true, "optional": true }, @@ -3827,15 +3831,6 @@ "safe-buffer": "^5.1.2" } }, - "mdn-browser-compat-data": { - "version": "1.0.30", - "resolved": "https://registry.npmjs.org/mdn-browser-compat-data/-/mdn-browser-compat-data-1.0.30.tgz", - "integrity": "sha512-LBhVq0Nxu9Qk/MrwP6EmqhKKXfyM9TbgIhvFuPhx6jk4Z2C0CMDCZ0OlhyISV2NvhEI9tYSIjJhUUOISft0JNw==", - "dev": true, - "requires": { - "extend": "3.0.2" - } - }, "memory-fs": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz", @@ -4167,9 +4162,9 @@ } }, "node-releases": { - "version": "1.1.59", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.59.tgz", - "integrity": "sha512-H3JrdUczbdiwxN5FuJPyCHnGHIFqQ0wWxo+9j1kAXAzqNMAHlo+4I/sYYxpyK0irQ73HgdiyzD32oqQDcU2Osw==", + "version": "1.1.69", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.69.tgz", + "integrity": "sha512-DGIjo79VDEyAnRlfSqYTsy+yoHd2IOjJiKUozD2MV2D85Vso6Bug56mb9tT/fY5Urt0iqk01H7x+llAruDR2zA==", "dev": true }, "normalize-package-data": { @@ -4584,9 +4579,9 @@ "dev": true }, "postcss": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.2.tgz", - "integrity": "sha512-HM1NDNWLgglJPQQMNwvLxgH2KcrKZklKLi/xXYIOaqQB57p/pDWEJNS83PVICYsn1Dg/9C26TiejNr422/ePaQ==", + "version": "8.2.4", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.4.tgz", + "integrity": "sha512-kRFftRoExRVXZlwUuay9iC824qmXPcQQVzAjbCCgjpXnkdMCJYBu2gTwAaFBzv8ewND6O8xFb3aELmEkh9zTzg==", "dev": true, "requires": { "colorette": "^1.2.1", @@ -4595,9 +4590,9 @@ } }, "postcss-cli": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/postcss-cli/-/postcss-cli-8.3.0.tgz", - "integrity": "sha512-GqWohD9VmH+LCe+xsv6VCdcgNylNBmsrbxJlyXUGteGGdcmazj2YxSiJMUmQpg8pE6LRox9idtsTB7JZq5a+rw==", + "version": "8.3.1", + "resolved": "https://registry.npmjs.org/postcss-cli/-/postcss-cli-8.3.1.tgz", + "integrity": "sha512-leHXsQRq89S3JC9zw/tKyiVV2jAhnfQe0J8VI4eQQbUjwIe0XxVqLrR+7UsahF1s9wi4GlqP6SJ8ydf44cgF2Q==", "dev": true, "requires": { "chalk": "^4.0.0", @@ -4661,9 +4656,9 @@ } }, "postcss-reporter": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-7.0.1.tgz", - "integrity": "sha512-R9AK80KIqqMb+lwGRBcRkXS7r96VCTxrZvvrfibyA/dWjqctwx7leHMCC05A9HbW8PnChwOWwrmISwp5HQu5wg==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-7.0.2.tgz", + "integrity": "sha512-JyQ96NTQQsso42y6L1H1RqHfWH1C3Jr0pt91mVv5IdYddZAE9DUZxuferNgk6q0o6vBVOrfVJb10X1FgDzjmDw==", "dev": true, "requires": { "colorette": "^1.2.1", @@ -4671,8 +4666,7 @@ "lodash.forown": "^4.4.0", "lodash.get": "^4.4.2", "lodash.groupby": "^4.6.0", - "lodash.sortby": "^4.7.0", - "log-symbols": "^4.0.0" + "lodash.sortby": "^4.7.0" } }, "postcss-value-parser": { @@ -6534,9 +6528,9 @@ "dev": true }, "yargs": { - "version": "16.1.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.1.1.tgz", - "integrity": "sha512-hAD1RcFP/wfgfxgMVswPE+z3tlPFtxG8/yWUrG2i17sTWGCGqWnxKcLTF4cUKDUK8fzokwsmO9H0TDkRbMHy8w==", + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", "dev": true, "requires": { "cliui": "^7.0.2", @@ -6546,14 +6540,6 @@ "string-width": "^4.2.0", "y18n": "^5.0.5", "yargs-parser": "^20.2.2" - }, - "dependencies": { - "escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "dev": true - } } }, "yargs-parser": { diff --git a/package.json b/package.json index 06f4ab9c..0fc90f08 100644 --- a/package.json +++ b/package.json @@ -23,10 +23,10 @@ "test": "npm run prettier:check && npm run xo" }, "devDependencies": { - "autoprefixer": "^10.1.0", - "eslint-plugin-compat": "^3.8.0", - "postcss": "^8.2.2", - "postcss-cli": "^8.3.0", + "autoprefixer": "^10.2.1", + "eslint-plugin-compat": "^3.9.0", + "postcss": "^8.2.4", + "postcss-cli": "^8.3.1", "prettier": "2.2.1", "xo": "^0.37.1" }, diff --git a/queries.php b/queries.php index 8dd3f005..b22c1954 100644 --- a/queries.php +++ b/queries.php @@ -59,12 +59,7 @@ else if(isset($_GET["forwarddest"])) } else if(isset($_GET["querytype"])) { - $qtypes = ["A (IPv4)", "AAAA (IPv6)", "ANY", "SRV", "SOA", "PTR", "TXT", "NAPTR", "MX", "DS", "RRSIG", "DNSKEY", "NS", "OTHER", "SVCB", "HTTPS"]; - $qtype = intval($_GET["querytype"]); - if($qtype > 0 && $qtype <= count($qtypes)) - $showing .= " ".$qtypes[$qtype-1]." queries"; - else - $showing .= " type ".$qtype." queries"; + $showing .= " type ".getQueryTypeStr($_GET["querytype"])." queries"; } else if(isset($_GET["domain"])) { diff --git a/scripts/pi-hole/php/func.php b/scripts/pi-hole/php/func.php index 73cff958..688b4aa8 100644 --- a/scripts/pi-hole/php/func.php +++ b/scripts/pi-hole/php/func.php @@ -405,4 +405,14 @@ function returnError($message = "", $json = true) } } +function getQueryTypeStr($querytype) +{ + $qtypes = ["A (IPv4)", "AAAA (IPv6)", "ANY", "SRV", "SOA", "PTR", "TXT", "NAPTR", "MX", "DS", "RRSIG", "DNSKEY", "NS", "OTHER", "SVCB", "HTTPS"]; + $qtype = intval($querytype); + if($qtype > 0 && $qtype <= count($qtypes)) + return $qtypes[$qtype-1]; + else + return "TYPE".($qtype - 100); +} + ?> diff --git a/scripts/pi-hole/php/groups.php b/scripts/pi-hole/php/groups.php index 6ae6ccfb..af138d9c 100644 --- a/scripts/pi-hole/php/groups.php +++ b/scripts/pi-hole/php/groups.php @@ -382,7 +382,10 @@ if ($_POST['action'] == 'get_groups') { throw new Exception('While executing DELETE statement: ' . $db->lastErrorMsg()); } - foreach ($_POST['groups'] as $gid) { + $groups = array(); + if(isset($_POST['groups'])) + $groups = $_POST['groups']; + foreach ($groups as $gid) { $stmt = $db->prepare('INSERT INTO client_by_group (client_id,group_id) VALUES(:id,:gid);'); if (!$stmt) { throw new Exception('While preparing INSERT INTO statement: ' . $db->lastErrorMsg()); @@ -400,7 +403,9 @@ if ($_POST['action'] == 'get_groups') { throw new Exception('While executing INSERT INTO statement: ' . $db->lastErrorMsg()); } } - $db->query('COMMIT;'); + if(!$db->query('COMMIT;')) { + throw new Exception('While commiting changes to the database: ' . $db->lastErrorMsg()); + } $reload = true; JSON_success(); @@ -437,7 +442,9 @@ if ($_POST['action'] == 'get_groups') { if (!$stmt->execute()) { throw new Exception('While executing client statement: ' . $db->lastErrorMsg()); } - $db->query('COMMIT;'); + if(!$db->query('COMMIT;')) { + throw new Exception('While commiting changes to the database: ' . $db->lastErrorMsg()); + } $reload = true; JSON_success(); @@ -677,7 +684,9 @@ if ($_POST['action'] == 'get_groups') { $added++; } - $db->query('COMMIT;'); + if(!$db->query('COMMIT;')) { + throw new Exception('While commiting changes to the database: ' . $db->lastErrorMsg()); + } $after = intval($db->querySingle("SELECT COUNT(*) FROM domainlist;")); $difference = $after - $before; @@ -739,39 +748,43 @@ if ($_POST['action'] == 'get_groups') { throw new Exception('While executing: ' . $db->lastErrorMsg()); } - if (isset($_POST['groups'])) { - $stmt = $db->prepare('DELETE FROM domainlist_by_group WHERE domainlist_id = :id'); + $stmt = $db->prepare('DELETE FROM domainlist_by_group WHERE domainlist_id = :id'); + if (!$stmt) { + throw new Exception('While preparing DELETE statement: ' . $db->lastErrorMsg()); + } + + if (!$stmt->bindValue(':id', intval($_POST['id']), SQLITE3_INTEGER)) { + throw new Exception('While binding id: ' . $db->lastErrorMsg()); + } + + if (!$stmt->execute()) { + throw new Exception('While executing DELETE statement: ' . $db->lastErrorMsg()); + } + + $groups = array(); + if(isset($_POST['groups'])) + $groups = $_POST['groups']; + foreach ($groups as $gid) { + $stmt = $db->prepare('INSERT INTO domainlist_by_group (domainlist_id,group_id) VALUES(:id,:gid);'); if (!$stmt) { - throw new Exception('While preparing DELETE statement: ' . $db->lastErrorMsg()); + throw new Exception('While preparing INSERT INTO statement: ' . $db->lastErrorMsg()); } if (!$stmt->bindValue(':id', intval($_POST['id']), SQLITE3_INTEGER)) { throw new Exception('While binding id: ' . $db->lastErrorMsg()); } + if (!$stmt->bindValue(':gid', intval($gid), SQLITE3_INTEGER)) { + throw new Exception('While binding gid: ' . $db->lastErrorMsg()); + } + if (!$stmt->execute()) { - throw new Exception('While executing DELETE statement: ' . $db->lastErrorMsg()); + throw new Exception('While executing INSERT INTO statement: ' . $db->lastErrorMsg()); } + } - foreach ($_POST['groups'] as $gid) { - $stmt = $db->prepare('INSERT INTO domainlist_by_group (domainlist_id,group_id) VALUES(:id,:gid);'); - if (!$stmt) { - throw new Exception('While preparing INSERT INTO statement: ' . $db->lastErrorMsg()); - } - - if (!$stmt->bindValue(':id', intval($_POST['id']), SQLITE3_INTEGER)) { - throw new Exception('While binding id: ' . $db->lastErrorMsg()); - } - - if (!$stmt->bindValue(':gid', intval($gid), SQLITE3_INTEGER)) { - throw new Exception('While binding gid: ' . $db->lastErrorMsg()); - } - - if (!$stmt->execute()) { - throw new Exception('While executing INSERT INTO statement: ' . $db->lastErrorMsg()); - } - } - $db->query('COMMIT;'); + if(!$db->query('COMMIT;')) { + throw new Exception('While commiting changes to the database: ' . $db->lastErrorMsg()); } $reload = true; @@ -810,7 +823,9 @@ if ($_POST['action'] == 'get_groups') { throw new Exception('While executing domainlist statement: ' . $db->lastErrorMsg()); } - $db->query('COMMIT;'); + if(!$db->query('COMMIT;')) { + throw new Exception('While commiting changes to the database: ' . $db->lastErrorMsg()); + } $reload = true; JSON_success(); @@ -856,7 +871,9 @@ if ($_POST['action'] == 'get_groups') { throw new Exception('While executing domainlist statement: ' . $db->lastErrorMsg()); } - $db->query('COMMIT;'); + if(!$db->query('COMMIT;')) { + throw new Exception('While commiting changes to the database: ' . $db->lastErrorMsg()); + } $reload = true; JSON_success(); @@ -920,7 +937,11 @@ if ($_POST['action'] == 'get_groups') { continue; } - if(preg_match("/[^a-zA-Z0-9:\/?&%=~._()-;]/", $address) !== 0) { + // this will remove first @ that is after schema and before domain + // $1 is optional schema, $2 is userinfo + $check_address = preg_replace("|([^:/]*://)?([^/]+)@|", "$1$2", $address, 1); + + if(preg_match("/[^a-zA-Z0-9:\/?&%=~._()-;]/", $check_address) !== 0) { throw new Exception('Invalid adlist URL ' . htmlentities($address) . '
'. 'Added ' . $added . " out of ". $total . " adlists"); } @@ -937,7 +958,9 @@ if ($_POST['action'] == 'get_groups') { $added++; } - $db->query('COMMIT;'); + if(!$db->query('COMMIT;')) { + throw new Exception('While commiting changes to the database: ' . $db->lastErrorMsg()); + } $reload = true; JSON_success(); @@ -993,7 +1016,10 @@ if ($_POST['action'] == 'get_groups') { throw new Exception('While executing DELETE statement: ' . $db->lastErrorMsg()); } - foreach ($_POST['groups'] as $gid) { + $groups = array(); + if(isset($_POST['groups'])) + $groups = $_POST['groups']; + foreach ($groups as $gid) { $stmt = $db->prepare('INSERT INTO adlist_by_group (adlist_id,group_id) VALUES(:id,:gid);'); if (!$stmt) { throw new Exception('While preparing INSERT INTO statement: ' . $db->lastErrorMsg()); @@ -1012,7 +1038,9 @@ if ($_POST['action'] == 'get_groups') { } } - $db->query('COMMIT;'); + if(!$db->query('COMMIT;')) { + throw new Exception('While commiting changes to the database: ' . $db->lastErrorMsg()); + } $reload = true; JSON_success(); @@ -1050,7 +1078,9 @@ if ($_POST['action'] == 'get_groups') { throw new Exception('While executing adlist statement: ' . $db->lastErrorMsg()); } - $db->query('COMMIT;'); + if(!$db->query('COMMIT;')) { + throw new Exception('While commiting changes to the database: ' . $db->lastErrorMsg()); + } $reload = true; JSON_success(); @@ -1090,7 +1120,9 @@ if ($_POST['action'] == 'get_groups') { $added++; } - $db->query('COMMIT;'); + if(!$db->query('COMMIT;')) { + throw new Exception('While commiting changes to the database: ' . $db->lastErrorMsg()); + } $after = intval($db->querySingle("SELECT COUNT(*) FROM domain_audit;")); $difference = $after - $before; diff --git a/style/pi-hole.css b/style/pi-hole.css index fe9b4424..63500631 100644 --- a/style/pi-hole.css +++ b/style/pi-hole.css @@ -210,7 +210,6 @@ } .chart-legend { - height: 250px; overflow: auto; } @@ -326,3 +325,8 @@ color: #f6f6f6; background: #367fa9; } + +.box, +.small-box { + border-radius: 10px; +} diff --git a/style/themes/default-dark.css b/style/themes/default-dark.css index c39ac33d..c3c143d7 100644 --- a/style/themes/default-dark.css +++ b/style/themes/default-dark.css @@ -97,7 +97,6 @@ h4 { .sidebar-menu > li.active > a { color: #fff; background-color: #22272a; - border-left-color: #272c30; } .sidebar-menu > li > .treeview-menu { margin: 0 1px; @@ -175,7 +174,6 @@ h4 { .box-solid > .box-header, .box > .box-header { color: #bec5cb; - background-color: #272c30; } .box-solid > .box-header a, .box > .box-header a,