github/vesta
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2025-08-14 10:37:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

improved domain validation

Browse source
This commit is contained in:
Serghey Rodin 2017-12-29 02:53:38 +02:00
commit b1449299bc
4 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
func/main.sh
View file

@ -875,12 +875,11 @@ format_domain() {
domain=$(echo "$domain" |sed -e "s/^www.//")
fi
if [[ "$domain" =~ .*\.$ ]]; then
domain=$(echo "$domain" |sed -e "s/\.$//")
domain=$(echo "$domain" |sed -e "s/[.]*$//g")
fi
if [[ "$domain" =~ ^\. ]]; then
domain=$(echo "$domain" |sed -e "s/^\.//")
domain=$(echo "$domain" |sed -e "s/^[.]*//")
fi
}
format_domain_idn() {
@ -896,6 +895,9 @@ format_aliases() {
if [ ! -z "$aliases" ] && [ "$aliases" != 'none' ]; then
aliases=$(echo $aliases |tr '[:upper:]' '[:lower:]' |tr ',' '\n')
aliases=$(echo "$aliases" |sed -e "s/\.$//" |sort -u)
aliases=$(echo "$aliases" |tr -s '.')
aliases=$(echo "$aliases" |sed -e "s/[.]*$//g")
aliases=$(echo "$aliases" |sed -e "s/^[.]*//")
aliases=$(echo "$aliases" |grep -v www.$domain |sed -e "/^$/d")
aliases=$(echo "$aliases" |tr '\n' ',' |sed -e "s/,$//")
fi