HV-1833 Check the regexp after the size when validating domain names

hibernate · Mar 8, 2021 · dd4eb35 · dd4eb35
1 parent b5d64de
commit dd4eb35
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/engine/src/main/java/org/hibernate/validator/internal/util/DomainNameUtil.java b/engine/src/main/java/org/hibernate/validator/internal/util/DomainNameUtil.java
@@ -80,11 +80,6 @@ private static boolean isValidDomainAddress(String domain, Pattern pattern) {
 			return false;
 		}
 
-		Matcher matcher = pattern.matcher( domain );
-		if ( !matcher.matches() ) {
-			return false;
-		}
-
 		String asciiString;
 		try {
 			asciiString = IDN.toASCII( domain );
@@ -97,6 +92,11 @@ private static boolean isValidDomainAddress(String domain, Pattern pattern) {
 			return false;
 		}
 
+		Matcher matcher = pattern.matcher( domain );
+		if ( !matcher.matches() ) {
+			return false;
+		}
+
 		return true;
 	}
 

diff --git a/...ava/org/hibernate/validator/test/internal/constraintvalidators/hv/EmailValidatorTest.java b/...ava/org/hibernate/validator/test/internal/constraintvalidators/hv/EmailValidatorTest.java
@@ -24,11 +24,11 @@
 import org.hibernate.validator.cfg.ConstraintMapping;
 import org.hibernate.validator.cfg.defs.EmailDef;
 import org.hibernate.validator.internal.constraintvalidators.hv.EmailValidator;
+import org.hibernate.validator.internal.util.DomainNameUtil;
 import org.hibernate.validator.internal.util.StringHelper;
 import org.hibernate.validator.testutil.MyCustomStringImpl;
 import org.hibernate.validator.testutil.TestForIssue;
 import org.hibernate.validator.testutils.ValidatorUtil;
-
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
@@ -222,6 +222,12 @@ public void testEmailWith256CharacterDomainPartIsInvalid() {
 		isInvalidEmail( "foo@" + domainOfLength( 252 ) + ".com" );
 	}
 
+	@Test
+	@TestForIssue(jiraKey = "HV-1833")
+	public void testLongEmail() {
+		assertEquals( false, DomainNameUtil.isValidEmailDomainAddress( stringOfLength( 5000 ) + ".com" ) );
+	}
+
 	private String stringOfLength(int length) {
 		StringBuilder builder = new StringBuilder();
 		for ( int i = 0; i < length; i++ ) {