From c544b0b2f4cc49fdf5f1f88218d294b785265ae3 Mon Sep 17 00:00:00 2001 From: rdwebdesign Date: Tue, 25 Jan 2022 17:15:37 -0300 Subject: [PATCH] Validating domains including uppercase Signed-off-by: rdwebdesign --- advanced/Scripts/webpage.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/advanced/Scripts/webpage.sh b/advanced/Scripts/webpage.sh index 0b9fb62b..743eac0e 100755 --- a/advanced/Scripts/webpage.sh +++ b/advanced/Scripts/webpage.sh @@ -648,12 +648,10 @@ Teleporter() { php /var/www/html/admin/scripts/pi-hole/php/teleporter.php > "pi-hole-${host:-noname}-teleporter_${datetimestamp}.tar.gz" } -checkDomain() -{ +checkDomain() { local domain validDomain - # Convert to lowercase - domain="${1,,}" - validDomain=$(grep -P "^((-|_)*[a-z\\d]((-|_)*[a-z\\d])*(-|_)*)(\\.(-|_)*([a-z\\d]((-|_)*[a-z\\d])*))*$" <<< "${domain}") # Valid chars check + domain="${1}" + validDomain=$(grep -P "^((-|_)*[A-Za-z\\d]((-|_)*[A-Za-z\\d])*(-|_)*)(\\.(-|_)*([A-Za-z\\d]((-|_)*[A-Za-z\\d])*))*$" <<< "${domain}") # Valid chars check validDomain=$(grep -P "^[^\\.]{1,63}(\\.[^\\.]{1,63})*$" <<< "${validDomain}") # Length of each label echo "${validDomain}" }