pi-hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2024-12-06 19:36:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1858 from pi-hole/devel

Browse Source 
Sync Devel -> release/v5.6
This commit is contained in:
Adam Warner
2021-08-04 20:46:21 +01:00
committed by GitHub
parent 3140bb5fce a7ec9510b5
commit 7ca95461bd
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/pi-hole/php/func.php
+1 -1
View File
@@ -34,7 +34,7 @@ function validDomain($domain_name, &$message = NULL)
function validDomainWildcard($domain_name)
{
// There has to be either no or at most one "*" at the beginning of a line
$validChars = preg_match("/^((\*.)?[_a-z\d](-*[_a-z\d])*)(\.([_a-z\d](-*[a-z\d])*))*(\.([_a-z\d])*)*$/i", $domain_name);
$validChars = preg_match("/^((\*\.)?[_a-z\d](-*[_a-z\d])*)(\.([_a-z\d](-*[a-z\d])*))*(\.([_a-z\d])*)*$/i", $domain_name);
$lengthCheck = preg_match("/^.{1,253}$/", $domain_name);
$labelLengthCheck = preg_match("/^[^\.]{1,63}(\.[^\.]{1,63})*$/", $domain_name);
return ( $validChars && $lengthCheck && $labelLengthCheck ); //length of each label
scripts/pi-hole/php/groups.php
+3
View File
@@ -546,6 +546,9 @@ if ($_POST['action'] == 'get_groups') {
$res['domain'] = $utf8_domain.' ('.$res['domain'].')';
}
}
// Prevent domain and comment fields from returning any arbitary javascript code which could be executed on the browser.
$res['domain'] = htmlentities($res['domain']);
$res['comment'] = htmlentities($res['comment']);
array_push($data, $res);
}