Author: bspeakmon
Date: Wed Oct 24 15:12:12 2007
New Revision: 588054
URL: http://svn.apache.org/viewvc?rev=588054&view=rev
Log:
- VALIDATOR-203/VALIDATOR-242: moving Email/UrlValidators to routines package
and deprecating
existing ones
Added:
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/EmailValidator.java
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/UrlValidator.java
Modified:
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/EmailValidator.java
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/UrlValidator.java
Modified:
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/EmailValidator.java
URL:
http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/EmailValidator.java?rev=588054&r1=588053&r2=588054&view=diff
==============================================================================
---
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/EmailValidator.java
(original)
+++
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/EmailValidator.java
Wed Oct 24 15:12:12 2007
@@ -39,6 +39,8 @@
*
* @version $Revision$ $Date$
* @since Validator 1.1
+ * @deprecated Use the new EmailValidator in the routines package. This class
+ * will be removed in a future release.
*/
public class EmailValidator {
Modified:
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/UrlValidator.java
URL:
http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/UrlValidator.java?rev=588054&r1=588053&r2=588054&view=diff
==============================================================================
---
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/UrlValidator.java
(original)
+++
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/UrlValidator.java
Wed Oct 24 15:12:12 2007
@@ -70,6 +70,8 @@
*
* @version $Revision$ $Date$
* @since Validator 1.1
+ * @deprecated Use the new UrlValidator in the routines package. This class
+ * will be removed in a future release.
*/
public class UrlValidator implements Serializable {
Added:
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=588054&view=auto
==============================================================================
---
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/EmailValidator.java
(added)
+++
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/EmailValidator.java
Wed Oct 24 15:12:12 2007
@@ -0,0 +1,232 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.validator.routines;
+
+import org.apache.oro.text.perl.Perl5Util;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * <p>Perform email validations.</p>
+ * <p>
+ * This class is a Singleton; you can retrieve the instance via the
getInstance() method.
+ * </p>
+ * <p>
+ * Based on a script by <a href="mailto:[EMAIL PROTECTED]">Sandeep V.
Tamhankar</a>
+ * http://javascript.internet.com
+ * </p>
+ * <p>
+ * This implementation is not guaranteed to catch all possible errors in an
email address.
+ * For example, an address like [EMAIL PROTECTED] will pass validator, even
though there
+ * is no TLD "somedog"
+ * </p>.
+ *
+ * @version $Revision: 586637 $ $Date: 2007-10-19 15:56:56 -0700 (Fri, 19 Oct
2007) $
+ * @since Validator 1.4
+ */
+public class EmailValidator {
+
+ private static final String SPECIAL_CHARS =
"\\000-\\037\\(\\)<>@,;:'\\\\\\\"\\.\\[\\]\\177";
+ private static final String VALID_CHARS = "[^\\s" + SPECIAL_CHARS + "]";
+ private static final String QUOTED_USER = "(\"[^\"]*\")";
+ private static final String ATOM = VALID_CHARS + '+';
+ private static final String WORD = "((" + VALID_CHARS + "|')+|" +
QUOTED_USER + ")";
+
+ // Each pattern must be surrounded by /
+ private static final String LEGAL_ASCII_PATTERN = "/^[\\000-\\177]+$/";
+ private static final String EMAIL_PATTERN = "/^(.+)@(.+)$/";
+ private static final String IP_DOMAIN_PATTERN = "^\\[(.*)\\]$";
+ private static final String TLD_PATTERN = "/^([a-zA-Z]+)$/";
+
+ private static final String USER_PATTERN = "/^\\s*" + WORD + "(\\." + WORD
+ ")*$/";
+ private static final String DOMAIN_PATTERN = "/^" + ATOM + "(\\." + ATOM +
")*\\s*$/";
+ private static final String ATOM_PATTERN = "/(" + ATOM + ")/";
+
+ /**
+ * Singleton instance of this class.
+ */
+ private static final EmailValidator EMAIL_VALIDATOR = new EmailValidator();
+
+ /**
+ * Returns the Singleton instance of this validator.
+ * @return singleton instance of this validator.
+ */
+ public static EmailValidator getInstance() {
+ return EMAIL_VALIDATOR;
+ }
+
+ /**
+ * Protected constructor for subclasses to use.
+ */
+ protected EmailValidator() {
+ super();
+ }
+
+ /**
+ * <p>Checks if a field has a valid e-mail address.</p>
+ *
+ * @param email The value validation is being performed on. A
<code>null</code>
+ * value is considered invalid.
+ * @return true if the email address is valid.
+ */
+ public boolean isValid(String email) {
+ if (email == null) {
+ return false;
+ }
+
+ Perl5Util matchAsciiPat = new Perl5Util();
+ if (!matchAsciiPat.match(LEGAL_ASCII_PATTERN, email)) {
+ return false;
+ }
+
+ email = stripComments(email);
+
+ // Check the whole email address structure
+ Perl5Util emailMatcher = new Perl5Util();
+ if (!emailMatcher.match(EMAIL_PATTERN, email)) {
+ return false;
+ }
+
+ if (email.endsWith(".")) {
+ return false;
+ }
+
+ if (!isValidUser(emailMatcher.group(1))) {
+ return false;
+ }
+
+ if (!isValidDomain(emailMatcher.group(2))) {
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Returns true if the domain component of an email address is valid.
+ * @param domain being validated.
+ * @return true if the email address's domain is valid.
+ */
+ protected boolean isValidDomain(String domain) {
+ boolean symbolic = false;
+
+ // see if domain is an IP address in brackets
+ Pattern ipDomainPattern = Pattern.compile(IP_DOMAIN_PATTERN);
+ Matcher ipDomainMatcher = ipDomainPattern.matcher(domain);
+
+ if (ipDomainMatcher.matches()) {
+ InetAddressValidator inetAddressValidator =
+ InetAddressValidator.getInstance();
+ if (inetAddressValidator.isValid(ipDomainMatcher.group(1))) {
+ return true;
+ }
+ } else {
+ // Domain is symbolic name
+ Perl5Util domainMatcher = new Perl5Util();
+ symbolic = domainMatcher.match(DOMAIN_PATTERN, domain);
+ }
+
+ if (symbolic) {
+ if (!isValidSymbolicDomain(domain)) {
+ return false;
+ }
+ } else {
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Returns true if the user component of an email address is valid.
+ * @param user being validated
+ * @return true if the user name is valid.
+ */
+ protected boolean isValidUser(String user) {
+ Perl5Util userMatcher = new Perl5Util();
+ return userMatcher.match(USER_PATTERN, user);
+ }
+
+ /**
+ * Validates a symbolic domain name. Returns true if it's valid.
+ * @param domain symbolic domain name
+ * @return true if the symbolic domain name is valid.
+ */
+ protected boolean isValidSymbolicDomain(String domain) {
+ String[] domainSegment = new String[10];
+ boolean match = true;
+ int i = 0;
+ Perl5Util atomMatcher = new Perl5Util();
+ while (match) {
+ match = atomMatcher.match(ATOM_PATTERN, domain);
+ if (match) {
+ domainSegment[i] = atomMatcher.group(1);
+ int l = domainSegment[i].length() + 1;
+ domain =
+ (l >= domain.length())
+ ? ""
+ : domain.substring(l);
+
+ i++;
+ }
+ }
+
+ int len = i;
+
+ // 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;
+ }
+
+ return true;
+ }
+ /**
+ * Recursively remove comments, and replace with a single space. The
simpler
+ * regexps in the Email Addressing FAQ are imperfect - they will miss
escaped
+ * chars in atoms, for example.
+ * Derived From Mail::RFC822::Address
+ * @param emailStr The email address
+ * @return address with comments removed.
+ */
+ protected String stripComments(String emailStr) {
+ String input = emailStr;
+ String result = emailStr;
+ String commentPat =
"s/^((?:[^\"\\\\]|\\\\.)*(?:\"(?:[^\"\\\\]|\\\\.)*\"(?:[^\"\\\\]|\111111\\\\.)*)*)\\((?:[^()\\\\]|\\\\.)*\\)/$1
/osx";
+ Perl5Util commentMatcher = new Perl5Util();
+ result = commentMatcher.substitute(commentPat,input);
+ // This really needs to be =~ or Perl5Matcher comparison
+ while (!result.equals(input)) {
+ input = result;
+ result = commentMatcher.substitute(commentPat,input);
+ }
+ return result;
+
+ }
+}
Added:
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/UrlValidator.java
URL:
http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/UrlValidator.java?rev=588054&view=auto
==============================================================================
---
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/UrlValidator.java
(added)
+++
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/UrlValidator.java
Wed Oct 24 15:12:12 2007
@@ -0,0 +1,477 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.validator.routines;
+
+import org.apache.commons.validator.GenericValidator;
+import org.apache.commons.validator.util.Flags;
+import org.apache.oro.text.perl.Perl5Util;
+
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * <p>Validates URLs.</p>
+ * Behavour of validation is modified by passing in options:
+ * <li>ALLOW_2_SLASHES - [FALSE] Allows double '/' characters in the path
+ * component.</li>
+ * <li>NO_FRAGMENT- [FALSE] By default fragments are allowed, if this option
is
+ * included then fragments are flagged as illegal.</li>
+ * <li>ALLOW_ALL_SCHEMES - [FALSE] By default only http, https, and ftp are
+ * considered valid schemes. Enabling this option will let any scheme pass
validation.</li>
+ *
+ * <p>Originally based in on php script by Debbie Dyer, validation.php v1.2b,
Date: 03/07/02,
+ * http://javascript.internet.com. However, this validation now bears little
resemblance
+ * to the php original.</p>
+ * <pre>
+ * Example of usage:
+ * Construct a UrlValidator with valid schemes of "http", and "https".
+ *
+ * String[] schemes = {"http","https"}.
+ * UrlValidator urlValidator = new UrlValidator(schemes);
+ * if (urlValidator.isValid("ftp://foo.bar.com/";)) {
+ * System.out.println("url is valid");
+ * } else {
+ * System.out.println("url is invalid");
+ * }
+ *
+ * prints "url is invalid"
+ * If instead the default constructor is used.
+ *
+ * UrlValidator urlValidator = new UrlValidator();
+ * if (urlValidator.isValid("ftp://foo.bar.com/";)) {
+ * System.out.println("url is valid");
+ * } else {
+ * System.out.println("url is invalid");
+ * }
+ *
+ * prints out "url is valid"
+ * </pre>
+ *
+ * @see
+ * <a href='http://www.ietf.org/rfc/rfc2396.txt' >
+ * Uniform Resource Identifiers (URI): Generic Syntax
+ * </a>
+ *
+ * @version $Revision: 586645 $ $Date: 2007-10-19 17:01:09 -0700 (Fri, 19 Oct
2007) $
+ * @since Validator 1.4
+ */
+public class UrlValidator implements Serializable {
+
+ /**
+ * Allows all validly formatted schemes to pass validation instead of
+ * supplying a set of valid schemes.
+ */
+ public static final int ALLOW_ALL_SCHEMES = 1 << 0;
+
+ /**
+ * Allow two slashes in the path component of the URL.
+ */
+ public static final int ALLOW_2_SLASHES = 1 << 1;
+
+ /**
+ * Enabling this options disallows any URL fragments.
+ */
+ public static final int NO_FRAGMENTS = 1 << 2;
+
+ private static final String ALPHA_CHARS = "a-zA-Z";
+
+ private static final String ALPHA_NUMERIC_CHARS = ALPHA_CHARS + "\\d";
+
+ private static final String SPECIAL_CHARS = ";/@&=,.?:+$";
+
+ private static final String VALID_CHARS = "[^\\s" + SPECIAL_CHARS + "]";
+
+ private static final String SCHEME_CHARS = ALPHA_CHARS;
+
+ // Drop numeric, and "+-." for now
+ private static final String AUTHORITY_CHARS = ALPHA_NUMERIC_CHARS +
"\\-\\.";
+
+ private static final String ATOM = VALID_CHARS + '+';
+
+ /**
+ * This expression derived/taken from the BNF for URI (RFC2396).
+ */
+ private static final String URL_PATTERN =
+ "/^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))?/";
+ // 12
3 4 5 6 7 8 9
+
+ /**
+ * Schema/Protocol (ie. http:, ftp:, file:, etc).
+ */
+ private static final int PARSE_URL_SCHEME = 2;
+
+ /**
+ * Includes hostname/ip and port number.
+ */
+ private static final int PARSE_URL_AUTHORITY = 4;
+
+ private static final int PARSE_URL_PATH = 5;
+
+ private static final int PARSE_URL_QUERY = 7;
+
+ private static final int PARSE_URL_FRAGMENT = 9;
+
+ /**
+ * Protocol (ie. http:, ftp:,https:).
+ */
+ private static final String SCHEME_PATTERN = "/^[" + SCHEME_CHARS + "]/";
+
+ private static final String AUTHORITY_PATTERN =
+ "/^([" + AUTHORITY_CHARS + "]*)(:\\d*)?(.*)?/";
+ //
1 2 3 4
+
+ private static final int PARSE_AUTHORITY_HOST_IP = 1;
+
+ private static final int PARSE_AUTHORITY_PORT = 2;
+
+ /**
+ * Should always be empty.
+ */
+ private static final int PARSE_AUTHORITY_EXTRA = 3;
+
+ private static final String PATH_PATTERN =
"/^(/[-\\w:@&?=+,.!/~*'%$_;]*)?$/";
+
+ private static final String QUERY_PATTERN = "/^(.*)$/";
+
+ private static final String LEGAL_ASCII_PATTERN = "/^[\\000-\\177]+$/";
+
+ private static final String DOMAIN_PATTERN =
+ "/^" + ATOM + "(\\." + ATOM + ")*$/";
+
+ private static final String PORT_PATTERN = "/^:(\\d{1,5})$/";
+
+ private static final String ATOM_PATTERN = "/(" + ATOM + ")/";
+
+ private static final String ALPHA_PATTERN = "/^[" + ALPHA_CHARS + "]/";
+
+ /**
+ * Holds the set of current validation options.
+ */
+ private Flags options = null;
+
+ /**
+ * The set of schemes that are allowed to be in a URL.
+ */
+ private Set allowedSchemes = new HashSet();
+
+ /**
+ * If no schemes are provided, default to this set.
+ */
+ protected String[] defaultSchemes = {"http", "https", "ftp"};
+
+ /**
+ * Create a UrlValidator with default properties.
+ */
+ public UrlValidator() {
+ this(null);
+ }
+
+ /**
+ * Behavior of validation is modified by passing in several strings
options:
+ * @param schemes Pass in one or more url schemes to consider valid,
passing in
+ * a null will default to "http,https,ftp" being valid.
+ * If a non-null schemes is specified then all valid schemes must
+ * be specified. Setting the ALLOW_ALL_SCHEMES option will
+ * ignore the contents of schemes.
+ */
+ public UrlValidator(String[] schemes) {
+ this(schemes, 0);
+ }
+
+ /**
+ * Initialize a UrlValidator with the given validation options.
+ * @param options The options should be set using the public constants
declared in
+ * this class. To set multiple options you simply add them together. For
example,
+ * ALLOW_2_SLASHES + NO_FRAGMENTS enables both of those options.
+ */
+ public UrlValidator(int options) {
+ this(null, options);
+ }
+
+ /**
+ * Behavour of validation is modified by passing in options:
+ * @param schemes The set of valid schemes.
+ * @param options The options should be set using the public constants
declared in
+ * this class. To set multiple options you simply add them together. For
example,
+ * ALLOW_2_SLASHES + NO_FRAGMENTS enables both of those options.
+ */
+ public UrlValidator(String[] schemes, int options) {
+ this.options = new Flags(options);
+
+ if (this.options.isOn(ALLOW_ALL_SCHEMES)) {
+ return;
+ }
+
+ if (schemes == null) {
+ schemes = this.defaultSchemes;
+ }
+
+ this.allowedSchemes.addAll(Arrays.asList(schemes));
+ }
+
+ /**
+ * <p>Checks if a field has a valid url address.</p>
+ *
+ * @param value The value validation is being performed on. A
<code>null</code>
+ * value is considered invalid.
+ * @return true if the url is valid.
+ */
+ public boolean isValid(String value) {
+ if (value == null) {
+ return false;
+ }
+
+ Perl5Util matchUrlPat = new Perl5Util();
+ Perl5Util matchAsciiPat = new Perl5Util();
+
+ if (!matchAsciiPat.match(LEGAL_ASCII_PATTERN, value)) {
+ return false;
+ }
+
+ // Check the whole url address structure
+ if (!matchUrlPat.match(URL_PATTERN, value)) {
+ return false;
+ }
+
+ if (!isValidScheme(matchUrlPat.group(PARSE_URL_SCHEME))) {
+ return false;
+ }
+
+ if (!isValidAuthority(matchUrlPat.group(PARSE_URL_AUTHORITY))) {
+ return false;
+ }
+
+ if (!isValidPath(matchUrlPat.group(PARSE_URL_PATH))) {
+ return false;
+ }
+
+ if (!isValidQuery(matchUrlPat.group(PARSE_URL_QUERY))) {
+ return false;
+ }
+
+ if (!isValidFragment(matchUrlPat.group(PARSE_URL_FRAGMENT))) {
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Validate scheme. If schemes[] was initialized to a non null,
+ * then only those scheme's are allowed. Note this is slightly different
+ * than for the constructor.
+ * @param scheme The scheme to validate. A <code>null</code> value is
considered
+ * invalid.
+ * @return true if valid.
+ */
+ protected boolean isValidScheme(String scheme) {
+ if (scheme == null) {
+ return false;
+ }
+
+ Perl5Util schemeMatcher = new Perl5Util();
+ if (!schemeMatcher.match(SCHEME_PATTERN, scheme)) {
+ return false;
+ }
+
+ if (this.options.isOff(ALLOW_ALL_SCHEMES)) {
+
+ if (!this.allowedSchemes.contains(scheme)) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * Returns true if the authority is properly formatted. An authority is
the combination
+ * of hostname and port. A <code>null</code> authority value is
considered invalid.
+ * @param authority Authority value to validate.
+ * @return true if authority (hostname and port) is valid.
+ */
+ protected boolean isValidAuthority(String authority) {
+ if (authority == null) {
+ return false;
+ }
+
+ Perl5Util authorityMatcher = new Perl5Util();
+ InetAddressValidator inetAddressValidator =
+ InetAddressValidator.getInstance();
+
+ if (!authorityMatcher.match(AUTHORITY_PATTERN, authority)) {
+ return false;
+ }
+
+ boolean hostname = false;
+ // check if authority is IP address or hostname
+ String hostIP = authorityMatcher.group(PARSE_AUTHORITY_HOST_IP);
+ boolean ipV4Address = inetAddressValidator.isValid(hostIP);
+
+ if (!ipV4Address) {
+ // Domain is hostname name
+ Perl5Util domainMatcher = new Perl5Util();
+ hostname = domainMatcher.match(DOMAIN_PATTERN, hostIP);
+ }
+
+ //rightmost hostname will never start with a digit.
+ if (hostname) {
+ // LOW-TECH FIX FOR VALIDATOR-202
+ // TODO: Rewrite to use ArrayList and .add semantics: see
VALIDATOR-203
+ char[] chars = hostIP.toCharArray();
+ int size = 1;
+ for(int i=0; i<chars.length; i++) {
+ if(chars[i] == '.') {
+ size++;
+ }
+ }
+ String[] domainSegment = new String[size];
+ boolean match = true;
+ int segmentCount = 0;
+ int segmentLength = 0;
+ Perl5Util atomMatcher = new Perl5Util();
+
+ while (match) {
+ match = atomMatcher.match(ATOM_PATTERN, hostIP);
+ if (match) {
+ domainSegment[segmentCount] = atomMatcher.group(1);
+ segmentLength = domainSegment[segmentCount].length() + 1;
+ hostIP =
+ (segmentLength >= hostIP.length())
+ ? ""
+ : hostIP.substring(segmentLength);
+
+ segmentCount++;
+ }
+ }
+ String topLevel = domainSegment[segmentCount - 1];
+ if (topLevel.length() < 2 || topLevel.length() > 4) {
+ return false;
+ }
+
+ // First letter of top level must be a alpha
+ Perl5Util alphaMatcher = new Perl5Util();
+ if (!alphaMatcher.match(ALPHA_PATTERN, topLevel.substring(0, 1))) {
+ return false;
+ }
+
+ // Make sure there's a host name preceding the authority.
+ if (segmentCount < 2) {
+ return false;
+ }
+ }
+
+ if (!hostname && !ipV4Address) {
+ return false;
+ }
+
+ String port = authorityMatcher.group(PARSE_AUTHORITY_PORT);
+ if (port != null) {
+ Perl5Util portMatcher = new Perl5Util();
+ if (!portMatcher.match(PORT_PATTERN, port)) {
+ return false;
+ }
+ }
+
+ String extra = authorityMatcher.group(PARSE_AUTHORITY_EXTRA);
+ if (!GenericValidator.isBlankOrNull(extra)) {
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Returns true if the path is valid. A <code>null</code> value is
considered invalid.
+ * @param path Path value to validate.
+ * @return true if path is valid.
+ */
+ protected boolean isValidPath(String path) {
+ if (path == null) {
+ return false;
+ }
+
+ Perl5Util pathMatcher = new Perl5Util();
+
+ if (!pathMatcher.match(PATH_PATTERN, path)) {
+ return false;
+ }
+
+ int slash2Count = countToken("//", path);
+ if (this.options.isOff(ALLOW_2_SLASHES) && (slash2Count > 0)) {
+ return false;
+ }
+
+ int slashCount = countToken("/", path);
+ int dot2Count = countToken("..", path);
+ if (dot2Count > 0) {
+ if ((slashCount - slash2Count - 1) <= dot2Count) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * Returns true if the query is null or it's a properly formatted query
string.
+ * @param query Query value to validate.
+ * @return true if query is valid.
+ */
+ protected boolean isValidQuery(String query) {
+ if (query == null) {
+ return true;
+ }
+
+ Perl5Util queryMatcher = new Perl5Util();
+ return queryMatcher.match(QUERY_PATTERN, query);
+ }
+
+ /**
+ * Returns true if the given fragment is null or fragments are allowed.
+ * @param fragment Fragment value to validate.
+ * @return true if fragment is valid.
+ */
+ protected boolean isValidFragment(String fragment) {
+ if (fragment == null) {
+ return true;
+ }
+
+ return this.options.isOff(NO_FRAGMENTS);
+ }
+
+ /**
+ * Returns the number of times the token appears in the target.
+ * @param token Token value to be counted.
+ * @param target Target value to count tokens in.
+ * @return the number of tokens.
+ */
+ protected int countToken(String token, String target) {
+ int tokenIndex = 0;
+ int count = 0;
+ while (tokenIndex != -1) {
+ tokenIndex = target.indexOf(token, tokenIndex);
+ if (tokenIndex > -1) {
+ tokenIndex++;
+ count++;
+ }
+ }
+ return count;
+ }
+}
