From 430abcd0e06c6caa173071795c476c21c61cc1f9 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Mon, 18 Jul 2016 20:04:12 +0300 Subject: [PATCH] fix for domain validator --- func/main.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/func/main.sh b/func/main.sh index b6c408bb4..617637b88 100644 --- a/func/main.sh +++ b/func/main.sh @@ -478,9 +478,8 @@ is_user_format_valid() { # Domain format validator is_domain_format_valid() { object_name=${2-domain} - mask1='(([[:alnum:]](-?[[:alnum:]])*)\.)' - mask2='*[[:alnum:]](-?[[:alnum:]])+\.[[:alnum:]]{2,}' - if ! [[ "$1" =~ ^${mask1}${mask2}$ ]]; then + exclude="[!|@|#|$|^|&|*|(|)|+|=|{|}|:|,|<|>|?|_|/|\|\"|'|;|%|\`| ]" + if [[ $1 =~ $exclude ]] || [[ $1 =~ ^[0-9]+$ ]] || [[ $1 =~ \.\. ]]; then check_result $E_INVALID "invalid $object_name format :: $1" fi }