Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-04-26 11:50:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Do not fail if IDNA<->UNICODE conversion fails

Browse Source 
Signed-off-by: Christian König <ckoenig@posteo.de>
This commit is contained in:
Christian König
2023-01-05 23:16:53 +01:00
committed by yubiuser
parent 92a5154c79
commit 68ac05fb7e
2 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -510,14 +510,11 @@ if ($_POST['action'] == 'get_groups') {
$res['groups'] = $groups;
if ($res['type'] === LISTTYPE_WHITELIST || $res['type'] === LISTTYPE_BLACKLIST) {
// Convert domain name to international form
// Skip this for the root zone `.`
if ($res['domain'] != '.') {
$utf8_domain = convertIDNAToUnicode($res['domain']);
$utf8_domain = convertIDNAToUnicode($res['domain']);
// if domain and international form are different, show both
if ($res['domain'] !== $utf8_domain) {
$res['domain'] = $utf8_domain.' ('.$res['domain'].')';
}
// if domain and international form are different, show both
if ($res['domain'] !== $utf8_domain) {
$res['domain'] = $utf8_domain.' ('.$res['domain'].')';
}
}
// Prevent domain and comment fields from returning any arbitrary javascript code which could be executed on the browser.
@@ -600,10 +597,7 @@ if ($_POST['action'] == 'get_groups') {
// If not adding a RegEx....
$input = $domain;
// Convert domain name to IDNA ASCII form for international domains
// Skip this for the root zone `.`
if ($domain != '.') {
$domain = convertUnicodeToIDNA($domain);
}
$domain = convertUnicodeToIDNA($domain);
// convert the domain lower case and check whether it is valid
$domain = strtolower($domain);
$msg = '';