From 34779f4179799a1f51d8cd3b4a99f0ed5219b249 Mon Sep 17 00:00:00 2001 From: Sahana Bogar Date: Mon, 26 Oct 2026 20:45:03 +0530 Subject: [PATCH] Reject host names in SubnetUtils6 instead of resolving them via DNS SubnetUtils6 parsed its input with InetAddress.getByName(), which resolves anything that is not an IP literal through DNS. A host name with an AAAA record inside the subnet made SubnetInfo.isInRange(String) return true, and each call could trigger a lookup of a caller-supplied name. Only accept strings shaped like an IPv6 literal, as SubnetUtils does for IPv4. --- .../org/apache/commons/net/util/SubnetUtils6.java | 7 +++++++ .../apache/commons/net/util/SubnetUtils6Test.java | 12 ++++++++++++ 2 files changed, 19 insertions(+) diff --git a/src/main/java/org/apache/commons/net/util/SubnetUtils6.java b/src/main/java/org/apache/commons/net/util/SubnetUtils6.java index 7670f0845..b44dcfe10 100644 --- a/src/main/java/org/apache/commons/net/util/SubnetUtils6.java +++ b/src/main/java/org/apache/commons/net/util/SubnetUtils6.java @@ -20,6 +20,7 @@ import java.net.Inet6Address; import java.net.InetAddress; import java.net.UnknownHostException; +import java.util.regex.Pattern; /** * Performs subnet calculations given an IPv6 network address and a prefix length. @@ -180,6 +181,8 @@ public String toString() { private static final String PARSE_FAIL = "Could not parse [%s]"; private static final BigInteger TWO = BigInteger.valueOf(2); private static final BigInteger MAX_VALUE = TWO.pow(NBITS).subtract(BigInteger.ONE); + // Hex digits and a colon first so InetAddress parses it as a literal; an optional scope ID follows '%' + private static final Pattern IPV6_LITERAL = Pattern.compile("\\[?[0-9a-fA-F]*:[0-9a-fA-F:.]*(%[^\\]]*)?\\]?"); /** * Formats a BigInteger as an IPv6 address string using {@link InetAddress#getHostAddress()}. @@ -228,6 +231,10 @@ private static byte[] toByteArray16(final BigInteger value) { * @throws IllegalArgumentException if the address cannot be parsed. */ private static byte[] toBytes(final String address) { + // InetAddress.getByName() would resolve a host name through DNS + if (address == null || !IPV6_LITERAL.matcher(address).matches()) { + throw new IllegalArgumentException(String.format(PARSE_FAIL, address) + " - not an IPv6 address"); + } try { final InetAddress inetAddr = InetAddress.getByName(address); if (inetAddr instanceof Inet6Address) { diff --git a/src/test/java/org/apache/commons/net/util/SubnetUtils6Test.java b/src/test/java/org/apache/commons/net/util/SubnetUtils6Test.java index 066b8a68b..18b495348 100644 --- a/src/test/java/org/apache/commons/net/util/SubnetUtils6Test.java +++ b/src/test/java/org/apache/commons/net/util/SubnetUtils6Test.java @@ -252,6 +252,18 @@ void testIsInRangeWithInvalidString() { assertThrows(IllegalArgumentException.class, () -> info.isInRange("192.168.1.1")); } + @Test + void testHostNameIsNotResolved() { + final SubnetInfo info = new SubnetUtils6("::1/128").getInfo(); + // Host names must be rejected, not resolved, even when they map to an address in range + assertThrows(IllegalArgumentException.class, () -> info.isInRange("localhost")); + assertThrows(IllegalArgumentException.class, () -> info.isInRange("ip6-localhost")); + assertThrows(IllegalArgumentException.class, () -> info.isInRange("")); + assertThrows(IllegalArgumentException.class, () -> new SubnetUtils6("localhost/128")); + assertTrue(info.isInRange("[::1]")); + assertTrue(new SubnetUtils6("fe80::/10").getInfo().isInRange("fe80::1%1")); + } + @Test void testLinkLocalAddress() { final SubnetUtils6 utils = new SubnetUtils6("fe80::/10");