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

domain validation fix

Browse source
This commit is contained in:
Serghey Rodin 2016-06-25 11:09:29 +03:00
commit e83c5c0043
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
func/main.sh
View file

@ -463,16 +463,24 @@ sync_cron_jobs() {
# User format validator # User format validator
is_user_format_valid() { is_user_format_valid() {
if ! [[ "$1" =~ ^[a-zA-Z0-9][-|\.|_|a-zA-Z0-9]{0,28}[a-zA-Z0-9]$ ]]; then if [ ${#1} -eq 1 ]; then
check_result $E_INVALID "invalid $2 format :: $1" if ! [[ "$1" =~ ^^[[:alnum:]]$ ]]; then
echo "invalid $2 format :: $1"
fi
else
if ! [[ "$1" =~ ^[[:alnum:]][-|\.|_[:alnum:]]{0,28}[[:alnum:]]$ ]]
then
echo "invalid $2 format :: $1"
fi
fi fi
} }
# Domain format validator # Domain format validator
is_domain_format_valid() { is_domain_format_valid() {
object_name=${2-domain} object_name=${2-domain}
exclude="[!|@|#|$|^|&|*|(|)|+|=|{|}|:|,|<|>|?|_|/|\|\"|'|;|%|\`| ]" mask1='(([[:alnum:]](-?[[:alnum:]])*)\.)'
if [[ "$1" =~ $exclude ]]; then mask2='*[[:alnum:]](-?[[:alnum:]])+\.[[:alnum:]]{2,}'
if ! [[ "$1" =~ ^${mask1}${mask2}$ ]]; then
check_result $E_INVALID "invalid $object_name format :: $1" check_result $E_INVALID "invalid $object_name format :: $1"
fi fi
} }