Skip to content

Require the IPv6: tag for bracketed IPv6 email literals #428

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
garydgregory merged 3 commits into from
Jul 22, 2026
+27 −4
Merged

Require the IPv6: tag for bracketed IPv6 email literals #428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
339edc4
require the IPv6: tag for bracketed IPv6 email literals
sahvx655-wq Jul 21, 2026
29558d4
match the IPv6: tag in IP_DOMAIN_REGEX instead of string matching
sahvx655-wq Jul 22, 2026
d0e24e9
Convert inline comment to Javadoc
garydgregory Jul 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions src/main/java/org/apache/commons/validator/routines/EmailValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,11 @@ public class EmailValidator implements Serializable {
private static final String WORD = "((" + VALID_CHARS + "|')+|" + QUOTED_USER + ")";

private static final String EMAIL_REGEX = "^(.+)@(\\S+)$";
private static final String IP_DOMAIN_REGEX = "^\\[(.*)\\]$";

/**
* RFC 5321 section 4.1.3: an IPv6 address literal carries the "IPv6:" tag (case-insensitive), an IPv4 literal is untagged.
*/
private static final String IP_DOMAIN_REGEX = "^\\[((?i)IPv6:)?(.*)\\]$";
private static final String USER_REGEX = "^" + WORD + "(\\." + WORD + ")*$";

private static final Pattern EMAIL_PATTERN = Pattern.compile(EMAIL_REGEX);
Expand Down Expand Up @@ -195,9 +199,11 @@ protected boolean isValidDomain(final String domain) {
final Matcher ipDomainMatcher = IP_DOMAIN_PATTERN.matcher(domain);

if (ipDomainMatcher.matches()) {
final InetAddressValidator inetAddressValidator =
InetAddressValidator.getInstance();
return inetAddressValidator.isValid(ipDomainMatcher.group(1));
final InetAddressValidator inetAddressValidator = InetAddressValidator.getInstance();
if (ipDomainMatcher.group(1) != null) {
return inetAddressValidator.isValidInet6Address(ipDomainMatcher.group(2));
}
return inetAddressValidator.isValidInet4Address(ipDomainMatcher.group(2));
}
// Domain is symbolic name
if (allowTld) {
Expand Down
17 changes: 17 additions & 0 deletions src/test/java/org/apache/commons/validator/routines/EmailValidatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,23 @@ void testEmailWithNumericAddress() {
assertTrue(validator.isValid("someone@yahoo.com"));
}

/**
* Tests IPv6 address literals in the domain, which RFC 5321 section 4.1.3 tags with "IPv6:".
*/
@Test
void testEmailWithIpv6AddressLiteral() {
// Tagged IPv6 literals are accepted; the tag is ABNF-literal text so it is case insensitive.
assertTrue(validator.isValid("someone@[IPv6:2001:db8::1]"));
assertTrue(validator.isValid("someone@[IPv6:::1]"));
assertTrue(validator.isValid("someone@[ipv6:fe80::1]"));
// A bare IPv6 literal without the tag is not a valid address literal.
assertFalse(validator.isValid("someone@[2001:db8::1]"));
assertFalse(validator.isValid("someone@[::1]"));
// The tag is IPv6 only; an IPv4 literal stays untagged.
assertTrue(validator.isValid("someone@[216.109.118.76]"));
assertFalse(validator.isValid("someone@[IPv6:216.109.118.76]"));
}

/**
* VALIDATOR-296 - A / or a ! is valid in the user part, but not in the domain part
*/
Expand Down
Loading