From aacaf1b08fdb1c427827b462e25f69bbeda21f01 Mon Sep 17 00:00:00 2001 From: Tjebbe Lievens Date: Fri, 29 Jul 2016 18:51:18 +0200 Subject: [PATCH 1/2] Improve email validation --- func/main.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/func/main.sh b/func/main.sh index 617637b8..920dd81c 100644 --- a/func/main.sh +++ b/func/main.sh @@ -612,7 +612,7 @@ is_dns_record_format_valid() { # Email format validator is_email_format_valid() { - if [[ ! "$1" =~ "@" ]] ; then + if [[ ! "$1" =~ ^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,63}$ ]] ; then check_result $E_INVALID "invalid email format :: $1" fi } From cd2eed6fd3292dc7a94098d3d9cf336ba65f1ee0 Mon Sep 17 00:00:00 2001 From: Tjebbe Lievens Date: Mon, 29 Aug 2016 20:15:34 +0200 Subject: [PATCH 2/2] use [:alnum:] in regex --- func/main.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/func/main.sh b/func/main.sh index 920dd81c..dedd5a00 100644 --- a/func/main.sh +++ b/func/main.sh @@ -612,7 +612,7 @@ is_dns_record_format_valid() { # Email format validator is_email_format_valid() { - if [[ ! "$1" =~ ^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,63}$ ]] ; then + if [[ ! "$1" =~ ^[A-Za-z0-9._%+-]+@[[:alnum:].-]+\.[A-Za-z]{2,63}$ ]] ; then check_result $E_INVALID "invalid email format :: $1" fi }