Merge pull request #396 from prasunjoshi/emailvalidator

IsExistingEmail refactor code and test
asaskevich · Aug 17, 2020 · 26e826e · 26e826e
2 parents 8b91a60 + c8310ec
commit 26e826e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/validator.go b/validator.go
@@ -84,13 +84,13 @@ func IsExistingEmail(email string) bool {
 	if len(user) > 64 {
 		return false
 	}
-	if userDotRegexp.MatchString(user) || !userRegexp.MatchString(user) || !hostRegexp.MatchString(host) {
-		return false
-	}
 	switch host {
 	case "localhost", "example.com":
 		return true
 	}
+	if userDotRegexp.MatchString(user) || !userRegexp.MatchString(user) || !hostRegexp.MatchString(host) {
+		return false
+	}
 	if _, err := net.LookupMX(host); err != nil {
 		if _, err := net.LookupIP(host); err != nil {
 			return false

diff --git a/validator_test.go b/validator_test.go
@@ -651,6 +651,10 @@ func TestIsExistingEmail(t *testing.T) {
 		{"@invalid.com", false},
 		{"NathAn.daVIeS@DomaIn.cOM", true},
 		{"NATHAN.DAVIES@DOMAIN.CO.UK", true},
+		{"prasun.joshi@localhost", true},
+		{"[prasun.joshi]@DomaIn.cOM", false},
+		{"sizeofuserismorethansixtyfour0123sizeofuserismorethansixtyfour0123@DOMAIN.CO.UK", false},
+		{"nosuchdomain@bar.nosuchdomainsuffix", false},
 	}
 	for _, test := range tests {
 		actual := IsExistingEmail(test.param)