Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-04-23 10:19:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Also check wildcard domains for validity before adding

Browse Source 
Signed-off-by: Christian König <ckoenig@posteo.de>
This commit is contained in:
Christian König
2022-05-26 23:34:52 +02:00
parent b954f62b0c
commit a75e8fc1d3
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/pi-hole/php/groups.php
View File

@@ -640,15 +640,9 @@ if ($_POST['action'] == 'get_groups') {
}
}
if(isset($_POST['type']) && strlen($_POST['type']) === 2 && $_POST['type'][1] === 'W')
if( ! ($_POST['type'] == '2' || $_POST['type'] == '3'))
{
// Apply wildcard-style formatting
$domain = "(\\.|^)".str_replace(".","\\.",$domain)."$";
}
if($type === ListType::whitelist || $type === ListType::blacklist)
{
// If adding to the exact lists, we convert the domain lower case and check whether it is valid
// If not adding a RegEx, we convert the domain lower case and check whether it is valid
$domain = strtolower($domain);
$msg = "";
if(!validDomain($domain, $msg))
@@ -664,6 +658,12 @@ if ($_POST['action'] == 'get_groups') {
}
}
if(isset($_POST['type']) && strlen($_POST['type']) === 2 && $_POST['type'][1] === 'W')
{
// Apply wildcard-style formatting
$domain = "(\\.|^)".str_replace(".","\\.",$domain)."$";
}
// First try to delete any occurrences of this domain if we're in
// replace mode. Only do this when the domain to be replaced is in
// the default group! Otherwise, we would shuffle group settings and
@@ -996,7 +996,7 @@ if ($_POST['action'] == 'get_groups') {
if (!$stmt->execute()) {
if ($db->lastErrorCode() == 19) {
// ErrorCode 19 is "Constraint violation", here the unique constraint of `address`
// ErrorCode 19 is "Constraint violation", here the unique constraint of `address`
// is violated (https://www.sqlite.org/rescode.html#constraint).
// If the list is already in database, add to ignored list, but don't throw error
$ignored++;