fix: Update regexp pattern of legacy EmailValidator (#12241)

Fixes: #12240
vaadin · Mar 12, 2021 · 754ca01 · 754ca01
1 parent 9978eec
commit 754ca01
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/EmailValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/EmailValidator.java
@@ -35,6 +35,11 @@
 @Deprecated
 public class EmailValidator extends RegexpValidator {
 
+    private static final String PATTERN = "^" + "([a-zA-Z0-9_\\.\\-+])+" // local
+            + "@" + "[a-zA-Z0-9-.]+" // domain
+            + "\\." + "[a-zA-Z0-9-]{2,}" // tld
+            + "$";
+
     /**
      * Creates a validator for checking that a string is a syntactically valid
      * e-mail address.
@@ -43,7 +48,6 @@ public class EmailValidator extends RegexpValidator {
      *            the message to display in case the value does not validate.
      */
     public EmailValidator(String errorMessage) {
-        super("^([a-zA-Z0-9_\\.\\-+])+@(([a-zA-Z0-9-])+\\.)+([a-zA-Z0-9]{2,4})+$",
-                true, errorMessage);
+        super(PATTERN, true, errorMessage);
     }
 }
diff --git a/...atibility-server/src/test/java/com/vaadin/v7/tests/data/validator/EmailValidatorTest.java b/...atibility-server/src/test/java/com/vaadin/v7/tests/data/validator/EmailValidatorTest.java
@@ -30,4 +30,9 @@ public void testEmailValidatorWithFaultyString() {
     public void testEmailValidatorWithOkEmail() {
         assertTrue(validator.isValid("[email protected]"));
     }
+
+    @Test
+    public void testEmailValidatorWithBadInput() {
+        assertFalse(validator.isValid("[email protected]&"));
+    }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java b/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java
@@ -25,7 +25,7 @@ public void verifyUserAgent() {
             // Chrome version does not necessarily match the desired version
             // because of auto updates...
             browserIdentifier = getExpectedUserAgentString(
-                    getDesiredCapabilities()) + "87";
+                    getDesiredCapabilities()) + "89";
         } else if (BrowserUtil.isFirefox(getDesiredCapabilities())) {
             browserIdentifier = getExpectedUserAgentString(
                     getDesiredCapabilities()) + "81";