Skip to content

Commit fc9738a

Browse files
authored
Resolve "minor" issue when entering url that is idn domain (hestiacp#2988)
1 parent d1875aa commit fc9738a

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

bin/v-add-web-domain-redirect

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,19 @@ is_object_unsuspended 'user' 'USER' "$user"
4242
is_object_valid 'web' 'DOMAIN' "$domain"
4343
is_object_unsuspended 'web' 'DOMAIN' "$domain"
4444

45+
idn_redirect=$(idn2 --quiet $3)
46+
if [ $? == 0 ]; then
47+
redirect=$idn_redirect;
48+
fi
49+
4550
if [[ "$3" =~ http://|https:// ]]; then
4651
scheme=1
47-
isValidUrl=$(php -r '$url=$argv[1]; $url=filter_var($url,FILTER_VALIDATE_URL); echo $url;' "$3")
52+
isValidUrl=$(php -r '$url=$argv[1]; $url=filter_var($url,FILTER_VALIDATE_URL); echo $url;' "$redirect")
4853
if [ -z "$isValidUrl" ]; then
4954
check_result $E_INVALID "Invalid redirect"
5055
fi
5156
else
52-
isValidUrl=$(php -r '$url=$argv[1]; $url=filter_var($url,FILTER_VALIDATE_URL); echo $url;' "http://$3")
57+
isValidUrl=$(php -r '$url=$argv[1]; $url=filter_var($url,FILTER_VALIDATE_URL); echo $url;' "http://$redirect")
5358
if [ -z "$isValidUrl" ]; then
5459
check_result $E_INVALID "Invalid redirect"
5560
fi

0 commit comments

Comments
 (0)