Skip to content

reject zone ids and prefix lengths in IPv6 email literals #437

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

Open
sahvx655-wq wants to merge 1 commit into
base: master
Choose a base branch
from
+22 −2
Open

reject zone ids and prefix lengths in IPv6 email literals #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 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 @@ -44,9 +44,11 @@ public class EmailValidator implements Serializable {
private static final String EMAIL_REGEX = "^(.+)@(\\S+)$";

/**
* RFC 5321 section 4.1.3: an IPv6 address literal carries the "IPv6:" tag (case-insensitive), an IPv4 literal is untagged.
* RFC 5321 section 4.1.3: an IPv6 address literal carries the "IPv6:" tag (case-insensitive), an IPv4 literal is untagged. The address itself is
* built from hex digits, ':' and the embedded IPv4 dotted form only, so a zone id ('%') or prefix length ('/'), which
* {@link InetAddressValidator#isValidInet6Address(String)} tolerates, is kept out of the literal here.
*/
private static final String IP_DOMAIN_REGEX = "^\\[((?i)IPv6:)?(.*)\\]$";
private static final String IP_DOMAIN_REGEX = "^\\[((?i)IPv6:)?([0-9a-fA-F:.]+)\\]$";
private static final String USER_REGEX = "^" + WORD + "(\\." + WORD + ")*$";

private static final Pattern EMAIL_PATTERN = Pattern.compile(EMAIL_REGEX);
Expand Down
18 changes: 18 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 @@ -461,6 +461,24 @@ void testEmailWithIpv6AddressLiteral() {
assertFalse(validator.isValid("someone@[IPv6:216.109.118.76]"));
}

/**
* Tests that an IPv6 address literal carrying a zone (scope) id or a prefix length is rejected. RFC 5321 section 4.1.3 builds IPv6-addr from
* hex groups and an optional embedded IPv4 address only, so neither belongs in a mailbox address literal even though
* {@link InetAddressValidator#isValidInet6Address(String)} accepts both.
*/
@Test
void testEmailWithIpv6AddressLiteralZoneOrPrefix() {
assertFalse(validator.isValid("someone@[IPv6:fe80::1%eth0]"));
assertFalse(validator.isValid("someone@[IPv6:fe80::1%25eth0]"));
assertFalse(validator.isValid("someone@[IPv6:2001:db8::1/64]"));
assertFalse(validator.isValid("someone@[IPv6:::1/128]"));
assertFalse(validator.isValid("someone@[216.109.118.76/24]"));
// The bare address forms, including the embedded IPv4 form, still validate.
assertTrue(validator.isValid("someone@[IPv6:fe80::1]"));
assertTrue(validator.isValid("someone@[IPv6:2001:db8::1]"));
assertTrue(validator.isValid("someone@[IPv6:::ffff:216.109.118.76]"));
}

/**
* Tests the email validation with numeric domains.
*/
Expand Down