You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2015/11/19 00:26:54 UTC
svn commit: r1715080 - in /commons/proper/validator/trunk/src:
changes/changes.xml
main/java/org/apache/commons/validator/routines/EmailValidator.java
test/java/org/apache/commons/validator/routines/EmailValidatorTest.java
Author: sebb
Date: Wed Nov 18 23:26:54 2015
New Revision: 1715080
URL: http://svn.apache.org/viewvc?rev=1715080&view=rev
Log:
VALIDATOR-364 Email Validator does not support quoted/escaped character in the local part of the email address
Modified:
commons/proper/validator/trunk/src/changes/changes.xml
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/EmailValidator.java
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/EmailValidatorTest.java
Modified: commons/proper/validator/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/changes/changes.xml?rev=1715080&r1=1715079&r2=1715080&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/changes/changes.xml (original)
+++ commons/proper/validator/trunk/src/changes/changes.xml Wed Nov 18 23:26:54 2015
@@ -90,6 +90,9 @@ The dependencies for Validator have not
For the current list of dependencies, please see
http://commons.apache.org/validator/dependencies.html
">
+ <action issue="VALIDATOR-364" type="fix" dev="sebb" due-to="teo bran">
+ Email Validator does not support quoted/escaped character in the local part of the email address
+ </action>
<action issue="VALIDATOR-381" type="fix" dev="ggregory">
Update commons-collections from 3.2.1 to 3.2.2.
</action>
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/EmailValidator.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/EmailValidator.java?rev=1715080&r1=1715079&r2=1715080&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/EmailValidator.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/EmailValidator.java Wed Nov 18 23:26:54 2015
@@ -38,7 +38,7 @@ public class EmailValidator implements S
private static final long serialVersionUID = 1705927040799295880L;
private static final String SPECIAL_CHARS = "\\p{Cntrl}\\(\\)<>@,;:'\\\\\\\"\\.\\[\\]";
- private static final String VALID_CHARS = "[^\\s" + SPECIAL_CHARS + "]";
+ private static final String VALID_CHARS = "(\\\\.)|[^\\s" + SPECIAL_CHARS + "]";
private static final String QUOTED_USER = "(\"[^\"]*\")";
private static final String WORD = "((" + VALID_CHARS + "|')+|" + QUOTED_USER + ")";
Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/EmailValidatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/EmailValidatorTest.java?rev=1715080&r1=1715079&r2=1715080&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/EmailValidatorTest.java (original)
+++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/EmailValidatorTest.java Wed Nov 18 23:26:54 2015
@@ -370,6 +370,14 @@ public class EmailValidatorTest extends
assertTrue(validator.isValid("john56789.john56789.john56789.john56789.john56789.john56789.john@example.com"));
assertFalse(validator.isValid("john56789.john56789.john56789.john56789.john56789.john56789.john5@example.com"));
+
+ assertTrue(validator.isValid("\\>escape\\\\special\\^characters\\<@example.com"));
+
+ assertTrue(validator.isValid("Abc\\@def@example.com"));
+
+ assertFalse(validator.isValid("Abc@def@example.com"));
+
+ assertTrue(validator.isValid("space\\ monkey@example.com"));
}
/**