You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by mr...@apache.org on 2005/08/14 21:42:41 UTC
svn commit: r232632 - in /jakarta/commons/proper/validator/trunk/src:
share/org/apache/commons/validator/EmailValidator.java
test/org/apache/commons/validator/EmailTest.java
Author: mrdon
Date: Sun Aug 14 12:42:37 2005
New Revision: 232632
URL: http://svn.apache.org/viewcvs?rev=232632&view=rev
Log:
Changed email validation on the tld:
- Requires alphabetic character, so no dashes
- Must be 2 or more characters, but no upper limit
In the future, a list of TLD's should be able to be passed to the validator, or be configurable in some other way.
PR: 33409 and 31644
Modified:
jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/EmailValidator.java
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/EmailTest.java
Modified: jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/EmailValidator.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/EmailValidator.java?rev=232632&r1=232631&r2=232632&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/EmailValidator.java (original)
+++ jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/EmailValidator.java Sun Aug 14 12:42:37 2005
@@ -34,8 +34,8 @@
* </p>
* <p>
* This implementation is not guaranteed to catch all possible errors in an email address.
- * For example, an address like nobody@noplace.d- will pass validator, even though there
- * is no TLD "d-"
+ * For example, an address like nobody@noplace.somedog will pass validator, even though there
+ * is no TLD "somedog"
* </p>.
* @since Validator 1.1
*/
@@ -52,7 +52,8 @@
private static final String EMAIL_PATTERN = "/^(.+)@(.+)$/";
private static final String IP_DOMAIN_PATTERN =
"/^\\[(\\d{1,3})[.](\\d{1,3})[.](\\d{1,3})[.](\\d{1,3})\\]$/";
-
+ private static final String TLD_PATTERN = "/^([a-zA-Z]+)$/";
+
private static final String USER_PATTERN = "/^\\s*" + WORD + "(\\." + WORD + ")*\\s*$/";
private static final String DOMAIN_PATTERN = "/^\\s*" + ATOM + "(\\." + ATOM + ")*\\s*$/";
private static final String ATOM_PATTERN = "/(" + ATOM + ")/";
@@ -206,14 +207,21 @@
}
int len = i;
- if (domainSegment[len - 1].length() < 2
- || domainSegment[len - 1].length() > 4) {
-
- return false;
- }
-
+
// Make sure there's a host name preceding the domain.
if (len < 2) {
+ return false;
+ }
+
+ // TODO: the tld should be checked against some sort of configurable
+ // list
+ String tld = domainSegment[len - 1];
+ if (tld.length() > 1) {
+ Perl5Util matchTldPat = new Perl5Util();
+ if (!matchTldPat.match(TLD_PATTERN, tld)) {
+ return false;
+ }
+ } else {
return false;
}
Modified: jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/EmailTest.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/EmailTest.java?rev=232632&r1=232631&r2=232632&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/EmailTest.java (original)
+++ jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/EmailTest.java Sun Aug 14 12:42:37 2005
@@ -119,14 +119,17 @@
info.setValue("jsmith@apache.info");
valueTest(info, true);
- info.setValue("jsmith@apache.infoo");
- valueTest(info, false);
-
info.setValue("jsmith@apache.");
valueTest(info, false);
info.setValue("jsmith@apache.c");
valueTest(info, false);
+
+ info.setValue("someone@yahoo.museum");
+ valueTest(info, true);
+
+ info.setValue("someone@yahoo.mu-seum");
+ valueTest(info, false);
}
/**
@@ -141,11 +144,11 @@
valueTest(info, true);
info.setValue("andy-noble@data-workshop.-com");
- valueTest(info, true);
+ valueTest(info, false);
info.setValue("andy-noble@data-workshop.c-om");
- valueTest(info,true);
+ valueTest(info,false);
info.setValue("andy-noble@data-workshop.co-m");
- valueTest(info, true);
+ valueTest(info, false);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org