From ba1ac8621f405ab842615ad06b745ac4571d8334 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Mon, 28 Dec 2020 07:57:58 +0100 Subject: [PATCH 01/14] Use empty array for foreach() when no group is to be set, always commit when editing domains, and report any errors while commiting. Signed-off-by: DL6ER --- scripts/pi-hole/php/groups.php | 96 ++++++++++++++++++++++------------ 1 file changed, 62 insertions(+), 34 deletions(-) diff --git a/scripts/pi-hole/php/groups.php b/scripts/pi-hole/php/groups.php index 6ae6ccfb..7da4f715 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(); @@ -937,7 +954,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 +1012,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 +1034,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 +1074,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 +1116,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; From fa2279d473d61c0bfee892e9ef6841b1188ecf15 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Thu, 31 Dec 2020 10:36:27 +0100 Subject: [PATCH 02/14] Add SVCB and HTTPS types and reduce code duplication Signed-off-by: DL6ER --- api_db.php | 36 +++++-------------------------- queries.php | 7 +----- scripts/pi-hole/php/func.php | 41 ++++++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 37 deletions(-) diff --git a/api_db.php b/api_db.php index 76b0ca5f..51d59ba4 100644 --- a/api_db.php +++ b/api_db.php @@ -120,40 +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 - switch($row[1]) { - case 1: - $query_type = "A"; - break; - case 2: - $query_type = "AAAA"; - break; - case 3: - $query_type = "ANY"; - break; - case 4: - $query_type = "SRV"; - break; - case 5: - $query_type = "SOA"; - break; - case 6: - $query_type = "PTR"; - break; - case 7: - $query_type = "TXT"; - break; - case 8: - $query_type = "NAPTR"; - break; - default: - $query_type = "UNKN"; - break; - } - // array: time type domain client status upstream destination + $query_type = getQueryTypeStr($row[1]); + + // 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/queries.php b/queries.php index 6044a244..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"]; - $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 0db73b18..1960760d 100644 --- a/scripts/pi-hole/php/func.php +++ b/scripts/pi-hole/php/func.php @@ -405,4 +405,45 @@ function returnError($message = "", $json = true) } } +function getQueryTypeStr($querytype) +{ + $qtype = intval($querytype); + switch ($qtype) { + case 1: + return "A (IPv4)"; + case 2: + return "AAAA (IPv6)"; + case 3: + return "ANY"; + case 4: + return "SRV"; + case 5: + return "SOA"; + case 6: + return "PTR"; + case 7: + return "TXT"; + case 8: + return "NAPTR"; + case 9: + return "MX"; + case 10: + return "DS"; + case 11: + return "RRSIG"; + case 12: + return "DNSKEY"; + case 13: + return "NS"; + case 14: + return "OTHER"; + case 15: + return "SVCB"; + case 16: + return "HTTPS"; + default: + return "UNKN (".$qtype.")"; + } +} + ?> From db40cc31fe655b1cd3daad71adb85872bcd434e7 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Mon, 4 Jan 2021 17:34:25 -0600 Subject: [PATCH 03/14] fix(cname_records): Fixed gammar Signed-off-by: Timothy Stewart --- cname_records.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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.

From c09263b926fa1b169f80afeb968179e692b665ab Mon Sep 17 00:00:00 2001 From: Matej Dujava Date: Tue, 5 Jan 2021 15:18:03 +0100 Subject: [PATCH 04/14] Adlist can contain userinfo (basicauth) Web side of fix https://github.com/pi-hole/pi-hole/pull/3912 Signed-off-by: Matej Dujava --- scripts/pi-hole/php/groups.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/pi-hole/php/groups.php b/scripts/pi-hole/php/groups.php index 6ae6ccfb..72bd95ff 100644 --- a/scripts/pi-hole/php/groups.php +++ b/scripts/pi-hole/php/groups.php @@ -920,7 +920,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"); } From 20d62259d2c04c686f1126ae5aee9a982375d784 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 9 Jan 2021 10:13:36 +0000 Subject: [PATCH 05/14] Bump autoprefixer from 10.1.0 to 10.2.1 Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 10.1.0 to 10.2.1. - [Release notes](https://github.com/postcss/autoprefixer/releases) - [Changelog](https://github.com/postcss/autoprefixer/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/autoprefixer/compare/10.1.0...10.2.1) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 48 +++++++++++++++++++++++------------------------ package.json | 2 +- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/package-lock.json b/package-lock.json index 468b57cf..67d65f48 100644 --- a/package-lock.json +++ b/package-lock.json @@ -640,42 +640,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 +685,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 } } @@ -2709,9 +2709,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": { diff --git a/package.json b/package.json index 06f4ab9c..059caccc 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "test": "npm run prettier:check && npm run xo" }, "devDependencies": { - "autoprefixer": "^10.1.0", + "autoprefixer": "^10.2.1", "eslint-plugin-compat": "^3.8.0", "postcss": "^8.2.2", "postcss-cli": "^8.3.0", From 7bc5398e6677b61a7f3427b73141ca1399ec0ef0 Mon Sep 17 00:00:00 2001 From: Gontier Julien Date: Tue, 12 Jan 2021 19:55:43 +0100 Subject: [PATCH 06/14] Don't need this backround-color for the interface. Signed-off-by: Gontier Julien --- style/themes/default-dark.css | 1 - 1 file changed, 1 deletion(-) diff --git a/style/themes/default-dark.css b/style/themes/default-dark.css index c39ac33d..dad76397 100644 --- a/style/themes/default-dark.css +++ b/style/themes/default-dark.css @@ -175,7 +175,6 @@ h4 { .box-solid > .box-header, .box > .box-header { color: #bec5cb; - background-color: #272c30; } .box-solid > .box-header a, .box > .box-header a, From 0381db72dd597d828abcb3eef23b25a2e7f98aff Mon Sep 17 00:00:00 2001 From: Gontier Julien Date: Tue, 12 Jan 2021 20:13:55 +0100 Subject: [PATCH 07/14] Fix gray space on the left side for cleaner look. Signed-off-by: Gontier Julien --- style/themes/default-dark.css | 1 - 1 file changed, 1 deletion(-) diff --git a/style/themes/default-dark.css b/style/themes/default-dark.css index c39ac33d..df6d7f8a 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; From 2da427ca030b86c2d32c72a4a997a075f0d9de0d Mon Sep 17 00:00:00 2001 From: Gontier Julien Date: Tue, 12 Jan 2021 20:18:32 +0100 Subject: [PATCH 08/14] Fix charts overflowing. Signed-off-by: Gontier Julien --- style/pi-hole.css | 1 - 1 file changed, 1 deletion(-) diff --git a/style/pi-hole.css b/style/pi-hole.css index fe9b4424..7ced4eef 100644 --- a/style/pi-hole.css +++ b/style/pi-hole.css @@ -210,7 +210,6 @@ } .chart-legend { - height: 250px; overflow: auto; } From b07e1439227b304c93b88a2c4fb8b4568e31520a Mon Sep 17 00:00:00 2001 From: Gontier Julien Date: Wed, 13 Jan 2021 19:38:14 +0100 Subject: [PATCH 09/14] Change radius to 10px for a more modern look (Fix) Signed-off-by: Gontier Julien --- style/pi-hole.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/style/pi-hole.css b/style/pi-hole.css index fe9b4424..6245bd93 100644 --- a/style/pi-hole.css +++ b/style/pi-hole.css @@ -326,3 +326,7 @@ color: #f6f6f6; background: #367fa9; } + +.box, .small-box { + border-radius:10px; +} \ No newline at end of file From 21a6847a33270787b00c1e5f8599172f99243999 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 9 Jan 2021 12:12:09 +0000 Subject: [PATCH 10/14] Bump eslint-plugin-compat from 3.8.0 to 3.9.0 Bumps [eslint-plugin-compat](https://github.com/amilajack/eslint-plugin-compat) from 3.8.0 to 3.9.0. - [Release notes](https://github.com/amilajack/eslint-plugin-compat/releases) - [Changelog](https://github.com/amilajack/eslint-plugin-compat/blob/master/CHANGELOG.md) - [Commits](https://github.com/amilajack/eslint-plugin-compat/compare/v3.8.0...v3.9.0) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 79 ++++++++++++++++++++++------------------------- package.json | 2 +- 2 files changed, 38 insertions(+), 43 deletions(-) diff --git a/package-lock.json b/package-lock.json index 67d65f48..335ff5f4 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", @@ -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": { @@ -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" } }, @@ -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": { diff --git a/package.json b/package.json index 059caccc..716eed74 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ }, "devDependencies": { "autoprefixer": "^10.2.1", - "eslint-plugin-compat": "^3.8.0", + "eslint-plugin-compat": "^3.9.0", "postcss": "^8.2.2", "postcss-cli": "^8.3.0", "prettier": "2.2.1", From d2ba0638f886c06ef828e0fb7c1469251fef1e55 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 13 Jan 2021 19:53:36 +0000 Subject: [PATCH 11/14] Bump postcss-cli from 8.3.0 to 8.3.1 Bumps [postcss-cli](https://github.com/postcss/postcss-cli) from 8.3.0 to 8.3.1. - [Release notes](https://github.com/postcss/postcss-cli/releases) - [Changelog](https://github.com/postcss/postcss-cli/blob/master/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss-cli/compare/8.3.0...8.3.1) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 49 +++++++++++++++++++---------------------------- package.json | 2 +- 2 files changed, 21 insertions(+), 30 deletions(-) diff --git a/package-lock.json b/package-lock.json index 335ff5f4..ec65d157 100644 --- a/package-lock.json +++ b/package-lock.json @@ -791,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": { @@ -1118,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", @@ -2746,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 }, @@ -4590,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", @@ -4656,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", @@ -4666,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": { @@ -6529,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", @@ -6541,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 716eed74..710c2cd1 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "autoprefixer": "^10.2.1", "eslint-plugin-compat": "^3.9.0", "postcss": "^8.2.2", - "postcss-cli": "^8.3.0", + "postcss-cli": "^8.3.1", "prettier": "2.2.1", "xo": "^0.37.1" }, From e3e1e456d15f81828f07377814404aff9fe956d0 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 13 Jan 2021 19:58:57 +0000 Subject: [PATCH 12/14] Bump postcss from 8.2.2 to 8.2.4 Bumps [postcss](https://github.com/postcss/postcss) from 8.2.2 to 8.2.4. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/8.2.2...8.2.4) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index ec65d157..c9ffb94f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4579,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", diff --git a/package.json b/package.json index 710c2cd1..0fc90f08 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "devDependencies": { "autoprefixer": "^10.2.1", "eslint-plugin-compat": "^3.9.0", - "postcss": "^8.2.2", + "postcss": "^8.2.4", "postcss-cli": "^8.3.1", "prettier": "2.2.1", "xo": "^0.37.1" From 509a082d02cb7affcb62ddf4b8120480aa9ce469 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Wed, 13 Jan 2021 20:40:04 +0000 Subject: [PATCH 13/14] Update scripts/pi-hole/php/groups.php --- scripts/pi-hole/php/groups.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pi-hole/php/groups.php b/scripts/pi-hole/php/groups.php index 72bd95ff..9ea8fcb4 100644 --- a/scripts/pi-hole/php/groups.php +++ b/scripts/pi-hole/php/groups.php @@ -921,7 +921,7 @@ if ($_POST['action'] == 'get_groups') { } // this will remove first @ that is after schema and before domain -  // $1 is optional schema, $2 is userinfo + // $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) { From 4ff4ea172fbc21fa0dc30d107e14d8c5630984bb Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Wed, 13 Jan 2021 20:47:36 +0000 Subject: [PATCH 14/14] fix prettier complaints Signed-off-by: Adam Warner --- style/pi-hole.css | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/style/pi-hole.css b/style/pi-hole.css index 6245bd93..e5efad52 100644 --- a/style/pi-hole.css +++ b/style/pi-hole.css @@ -327,6 +327,7 @@ background: #367fa9; } -.box, .small-box { - border-radius:10px; -} \ No newline at end of file +.box, +.small-box { + border-radius: 10px; +}