andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Handle the interface name in IPv6 address correctly

Browse Source 
Motivation:

NetUtil.isValidIpV6Address() handles the interface name in IPv6 address
incorrectly. For example, it returns false for the following addresses:

- ::1%lo
- ::1%_%_in_name_

Modifications:

- Strip the square brackets before validation for simplicity
- Strip the part after the percent sign completely before validation for
  simplicity
- Simplify and reformat NetUtilTest

Result:

- The interface names in IPv6 addresses are handled correctly.
- NetUtilTest is cleaner
This commit is contained in:
Trustin Lee 2014-11-12 12:11:31 +09:00
parent 02f883d833
commit 37a6f5ed5d
2 changed files with 364 additions and 454 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
common/src/main/java/io/netty/util/NetUtil.java
View File

@ -443,45 +443,36 @@ public final class NetUtil {
boolean doubleColon = false; boolean doubleColon = false;
int numberOfColons = 0; int numberOfColons = 0;
int numberOfPeriods = 0; int numberOfPeriods = 0;
int numberOfPercent = 0;
StringBuilder word = new StringBuilder(); StringBuilder word = new StringBuilder();
char c = 0; char c = 0;
char prevChar; char prevChar;
int offset = 0; // offset for [] ip addresses int startOffset = 0; // offset for [] ip addresses
int endOffset = ipAddress.length();
if (length < 2) { if (endOffset < 2) {
return false; return false;
} }
for (int i = 0; i < length; i ++) { // Strip []
if (ipAddress.charAt(0) == '[') {
if (ipAddress.charAt(endOffset - 1) != ']') {
return false; // must have a close ]
}
startOffset = 1;
endOffset --;
}
// Strip the interface name/index after the percent sign.
int percentIdx = ipAddress.indexOf('%', startOffset);
if (percentIdx >= 0) {
endOffset = percentIdx;
}
for (int i = startOffset; i < endOffset; i ++) {
prevChar = c; prevChar = c;
c = ipAddress.charAt(i); c = ipAddress.charAt(i);
switch (c) { switch (c) {
// case for an open bracket [x:x:x:...x]
case '[':
if (i != 0) {
return false; // must be first character
}
if (ipAddress.charAt(length - 1) != ']') {
return false; // must have a close ]
}
offset = 1;
if (length < 4) {
return false;
}
break;
// case for a closed bracket at end of IP [x:x:x:...x]
case ']':
if (i != length - 1) {
return false; // must be last charcter
}
if (ipAddress.charAt(0) != '[') {
return false; // must have a open [
}
break;
// case for the last 32-bits represented as IPv4 x:x:x:x:x:x:d.d.d.d // case for the last 32-bits represented as IPv4 x:x:x:x:x:x:d.d.d.d
case '.': case '.':
numberOfPeriods ++; numberOfPeriods ++;
@ -496,8 +487,8 @@ public final class NetUtil {
} }
// a special case ::1:2:3:4:5:d.d.d.d allows 7 colons with an // a special case ::1:2:3:4:5:d.d.d.d allows 7 colons with an
// IPv4 ending, otherwise 7 :'s is bad // IPv4 ending, otherwise 7 :'s is bad
if (numberOfColons == 7 && ipAddress.charAt(offset) != ':' && if (numberOfColons == 7 && ipAddress.charAt(startOffset) != ':' &&
ipAddress.charAt(1 + offset) != ':') { ipAddress.charAt(1 + startOffset) != ':') {
return false; return false;
} }
word.delete(0, word.length()); word.delete(0, word.length());
@ -507,7 +498,7 @@ public final class NetUtil {
// FIX "IP6 mechanism syntax #ip6-bad1" // FIX "IP6 mechanism syntax #ip6-bad1"
// An IPV6 address cannot start with a single ":". // An IPV6 address cannot start with a single ":".
// Either it can starti with "::" or with a number. // Either it can starti with "::" or with a number.
if (i == offset && (ipAddress.length() <= i || ipAddress.charAt(i + 1) != ':')) { if (i == startOffset && (ipAddress.length() <= i || ipAddress.charAt(i + 1) != ':')) {
return false; return false;
} }
// END FIX "IP6 mechanism syntax #ip6-bad1" // END FIX "IP6 mechanism syntax #ip6-bad1"
@ -526,38 +517,13 @@ public final class NetUtil {
} }
word.delete(0, word.length()); word.delete(0, word.length());
break; break;
case '%':
if (numberOfColons == 0) {
return false;
}
numberOfPercent ++;
// validate that the stuff after the % is valid
if (i + 1 >= length) {
// in this case the percent is there but no number is
// available
return false;
}
try {
if (Integer.parseInt(ipAddress.substring(i + 1)) < 0) {
return false;
}
} catch (NumberFormatException e) {
// right now we just support an integer after the % so if
// this is not
// what is there then return
return false;
}
break;
default: default:
if (numberOfPercent == 0) { if (word != null && word.length() > 3) {
if (word != null && word.length() > 3) { return false;
return false; }
} if (!isValidHexChar(c)) {
if (!isValidHexChar(c)) { return false;
return false;
}
} }
word.append(c); word.append(c);
} }
@ -579,11 +545,9 @@ public final class NetUtil {
// If we have an empty word at the end, it means we ended in either // If we have an empty word at the end, it means we ended in either
// a : or a . // a : or a .
// If we did not end in :: then this is invalid // If we did not end in :: then this is invalid
if (numberOfPercent == 0) { if (word.length() == 0 && ipAddress.charAt(length - 1 - startOffset) == ':' &&
if (word.length() == 0 && ipAddress.charAt(length - 1 - offset) == ':' && ipAddress.charAt(length - 2 - startOffset) != ':') {
ipAddress.charAt(length - 2 - offset) != ':') { return false;
return false;
}
} }
} }
@ -696,7 +660,7 @@ public final class NetUtil {
int i = 0; int i = 0;
int ipv6Seperators = 0; int ipv6Seperators = 0;
int ipv4Seperators = 0; int ipv4Seperators = 0;
int tmp = 0; int tmp;
boolean needsShift = false; boolean needsShift = false;
for (; i < ipLength; ++i) { for (; i < ipLength; ++i) {
final char c = ip.charAt(i); final char c = ip.charAt(i);

718
common/src/test/java/io/netty/util/NetUtilTest.java
View File

@ -15,12 +15,7 @@
*/ */
package io.netty.util; package io.netty.util;
import static org.junit.Assert.assertArrayEquals; import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertNull;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.UnknownHostException; import java.net.UnknownHostException;
@ -28,468 +23,387 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import org.junit.Test; import static org.junit.Assert.*;
public class NetUtilTest { public class NetUtilTest {
private static final Map<String, byte[]> validIpV4Hosts = new HashMap<String, byte[]>() {
private static final long serialVersionUID = 2629792739366724032L; private static final class TestMap extends HashMap<String, String> {
{ private static final long serialVersionUID = -298642816998608473L;
put("192.168.1.0", new byte[]{
(byte) 0xc0, (byte) 0xa8, 0x01, 0x00} TestMap(String... values) {
); for (int i = 0; i < values.length; i += 2) {
put("10.255.255.254", new byte[]{ String key = values[i];
0x0a, (byte) 0xff, (byte) 0xff, (byte) 0xfe String value = values[i + 1];
}); put(key, value);
put("172.18.5.4", new byte[]{ }
(byte) 0xac, 0x12, 0x05, 0x04
});
put("0.0.0.0", new byte[]{
0x00, 0x00, 0x00, 0x00
});
put("127.0.0.1", new byte[]{
0x7f, 0x00, 0x00, 0x01
});
} }
}; }
private static final Map<String, byte[]> invalidIpV4Hosts = new HashMap<String, byte[]>() {
private static final long serialVersionUID = 1299215199895717282L; private static final Map<String, String> validIpV4Hosts = new TestMap(
{ "192.168.1.0", "c0a80100",
put("1.256.3.4", null); "10.255.255.254", "0afffffe",
put("256.0.0.1", null); "172.18.5.4", "ac120504",
put("1.1.1.1.1", null); "0.0.0.0", "00000000",
put("x.255.255.255", null); "127.0.0.1", "7f000001");
put("0.1:0.0", null);
put("0.1.0.0:", null); private static final Map<String, String> invalidIpV4Hosts = new TestMap(
put("127.0.0.", null); "1.256.3.4", null,
put("1.2..4", null); "256.0.0.1", null,
put("192.0.1", null); "1.1.1.1.1", null,
put("192.0.1.1.1", null); "x.255.255.255", null,
put("192.0.1.a", null); "0.1:0.0", null,
put("19a.0.1.1", null); "0.1.0.0:", null,
put("a.0.1.1", null); "127.0.0.", null,
put(".0.1.1", null); "1.2..4", null,
put("...", null); "192.0.1", null,
} "192.0.1.1.1", null,
}; "192.0.1.a", null,
private static final Map<String, byte[]> validIpV6Hosts = new HashMap<String, byte[]>() { "19a.0.1.1", null,
private static final long serialVersionUID = 3999763170377573184L; "a.0.1.1", null,
{ ".0.1.1", null,
put("::ffff:5.6.7.8", new byte[]{ "...", null);
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, private static final Map<String, String> validIpV6Hosts = new TestMap(
0x00, 0x00, (byte) 0xff, (byte) 0xff, "::ffff:5.6.7.8", "00000000000000000000ffff05060708",
0x05, 0x06, 0x07, 0x08} "fdf8:f53b:82e4::53", "fdf8f53b82e400000000000000000053",
); "fe80::200:5aee:feaa:20a2", "fe8000000000000002005aeefeaa20a2",
put("fdf8:f53b:82e4::53", new byte[]{ "2001::1", "20010000000000000000000000000001",
(byte) 0xfd, (byte) 0xf8, (byte) 0xf5, 0x3b, "2001:0000:4136:e378:8000:63bf:3fff:fdd2", "200100004136e378800063bf3ffffdd2",
(byte) 0x82, (byte) 0xe4, 0x00, 0x00, "2001:0002:6c::430", "20010002006c00000000000000000430",
0x00, 0x00, 0x00, 0x00, "2001:10:240:ab::a", "20010010024000ab000000000000000a",
0x00, 0x00, 0x00, 0x53} "2002:cb0a:3cdd:1::1", "2002cb0a3cdd00010000000000000001",
); "2001:db8:8:4::2", "20010db8000800040000000000000002",
put("fe80::200:5aee:feaa:20a2", new byte[]{ "ff01:0:0:0:0:0:0:2", "ff010000000000000000000000000002",
(byte) 0xfe, (byte) 0x80, 0x00, 0x00, "[fdf8:f53b:82e4::53]", "fdf8f53b82e400000000000000000053",
0x00, 0x00, 0x00, 0x00, "[fe80::200:5aee:feaa:20a2]", "fe8000000000000002005aeefeaa20a2",
0x02, 0x00, 0x5a, (byte) 0xee, "[2001::1]", "20010000000000000000000000000001",
(byte) 0xfe, (byte) 0xaa, 0x20, (byte) 0xa2} "[2001:0000:4136:e378:8000:63bf:3fff:fdd2]", "200100004136e378800063bf3ffffdd2",
); "0:1:2:3:4:5:6:789a", "0000000100020003000400050006789a",
put("2001::1", new byte[]{ "0:1:2:3::f", "0000000100020003000000000000000f",
0x20, 0x01, 0x00, 0x00, "0:0:0:0:0:0:10.0.0.1", "0000000000000000000000000a000001",
0x00, 0x00, 0x00, 0x00, "::ffff:192.168.0.1", "00000000000000000000ffffc0a80001",
0x00, 0x00, 0x00, 0x00, // Test if various interface names after the percent sign are recognized.
0x00, 0x00, 0x00, 0x01} "[::1%1]", "00000000000000000000000000000001",
); "[::1%eth0]", "00000000000000000000000000000001",
put("2001:0000:4136:e378:8000:63bf:3fff:fdd2", new byte[]{ "[::1%%]", "00000000000000000000000000000001",
0x20, 0x01, 0x00, 0x00, "::1%1", "00000000000000000000000000000001",
0x41, 0x36, (byte) 0xe3, 0x78, "::1%eth0", "00000000000000000000000000000001",
(byte) 0x80, 0x00, 0x63, (byte) 0xbf, "::1%%", "00000000000000000000000000000001");
0x3f, (byte) 0xff, (byte) 0xfd, (byte) 0xd2}
); private static final Map<String, String> invalidIpV6Hosts = new TestMap(
put("2001:0002:6c::430", new byte[]{
0x20, 0x01, 0x00, 0x02,
0x00, 0x6c, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x04, 0x30}
);
put("2001:10:240:ab::a", new byte[]{
0x20, 0x01, 0x00, 0x10,
0x02, 0x40, 0x00, (byte) 0xab,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x0a});
put("2002:cb0a:3cdd:1::1", new byte[]{
0x20, 0x02, (byte) 0xcb, 0x0a,
0x3c, (byte) 0xdd, 0x00, 0x01,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01}
);
put("2001:db8:8:4::2", new byte[]{
0x20, 0x01, 0x0d, (byte) 0xb8,
0x00, 0x08, 0x00, 0x04,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x02}
);
put("ff01:0:0:0:0:0:0:2", new byte[]{
(byte) 0xff, 0x01, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x02}
);
put("[fdf8:f53b:82e4::53]", new byte[]{
(byte) 0xfd, (byte) 0xf8, (byte) 0xf5, 0x3b,
(byte) 0x82, (byte) 0xe4, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x53}
);
put("[fe80::200:5aee:feaa:20a2]", new byte[]{
(byte) 0xfe, (byte) 0x80, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x02, 0x00, 0x5a, (byte) 0xee,
(byte) 0xfe, (byte) 0xaa, 0x20, (byte) 0xa2}
);
put("[2001::1]", new byte[]{
0x20, 0x01, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01}
);
put("[2001:0000:4136:e378:8000:63bf:3fff:fdd2]", new byte[]{
0x20, 0x01, 0x00, 0x00,
0x41, 0x36, (byte) 0xe3, 0x78,
(byte) 0x80, 0x00, 0x63, (byte) 0xbf,
0x3f, (byte) 0xff, (byte) 0xfd, (byte) 0xd2}
);
put("0:1:2:3:4:5:6:789a", new byte[]{
0x00, 0x00, 0x00, 0x01,
0x00, 0x02, 0x00, 0x03,
0x00, 0x04, 0x00, 0x05,
0x00, 0x06, 0x78, (byte) 0x9a}
);
put("0:1:2:3::f", new byte[]{
0x00, 0x00, 0x00, 0x01,
0x00, 0x02, 0x00, 0x03,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x0f}
);
put("0:0:0:0:0:0:10.0.0.1", new byte[]{
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x0a, 0x00, 0x00, 0x01}
);
put("::ffff:192.168.0.1", new byte[]{
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, (byte) 0xff, (byte) 0xff,
(byte) 0xc0, (byte) 0xa8, 0x00, 0x01}
);
}
};
private static final Map<String, byte[]> invalidIpV6Hosts = new HashMap<String, byte[]>() {
private static final long serialVersionUID = -5870810805409009696L;
{
// Test method with garbage. // Test method with garbage.
put("Obvious Garbage", null); "Obvious Garbage", null,
// Test method with preferred style, too many : // Test method with preferred style, too many :
put("0:1:2:3:4:5:6:7:8", null); "0:1:2:3:4:5:6:7:8", null,
// Test method with preferred style, not enough : // Test method with preferred style, not enough :
put("0:1:2:3:4:5:6", null); "0:1:2:3:4:5:6", null,
// Test method with preferred style, bad digits. // Test method with preferred style, bad digits.
put("0:1:2:3:4:5:6:x", null); "0:1:2:3:4:5:6:x", null,
// Test method with preferred style, adjacent : // Test method with preferred style, adjacent :
put("0:1:2:3:4:5:6::7", null); "0:1:2:3:4:5:6::7", null,
// Too many : separators trailing // Too many : separators trailing
put("0:1:2:3:4:5:6:7::", null); "0:1:2:3:4:5:6:7::", null,
// Too many : separators leading // Too many : separators leading
put("::0:1:2:3:4:5:6:7", null); "::0:1:2:3:4:5:6:7", null,
// Too many : separators trailing // Too many : separators trailing
put("1:2:3:4:5:6:7:", null); "1:2:3:4:5:6:7:", null,
// Too many : separators leading // Too many : separators leading
put(":1:2:3:4:5:6:7", null); ":1:2:3:4:5:6:7", null,
// Too many : separators leading 0 // Too many : separators leading 0
put("0::1:2:3:4:5:6:7", null); "0::1:2:3:4:5:6:7", null,
// Test method with preferred style, too many digits. // Test method with preferred style, too many digits.
put("0:1:2:3:4:5:6:789abcdef", null); "0:1:2:3:4:5:6:789abcdef", null,
// Test method with compressed style, bad digits. // Test method with compressed style, bad digits.
put("0:1:2:3::x", null); "0:1:2:3::x", null,
// Test method with compressed style, too many adjacent : // Test method with compressed style, too many adjacent :
put("0:1:2:::3", null); "0:1:2:::3", null,
// Test method with compressed style, too many digits. // Test method with compressed style, too many digits.
put("0:1:2:3::abcde", null); "0:1:2:3::abcde", null,
// Test method with preferred style, too many : // Test method with preferred style, too many :
put("0:1:2:3:4:5:6:7:8", null); "0:1:2:3:4:5:6:7:8", null,
// Test method with compressed style, not enough : // Test method with compressed style, not enough :
put("0:1", null); "0:1", null,
// Test method with ipv4 style, bad ipv6 digits. // Test method with ipv4 style, bad ipv6 digits.
put("0:0:0:0:0:x:10.0.0.1", null); "0:0:0:0:0:x:10.0.0.1", null,
// Test method with ipv4 style, bad ipv4 digits. // Test method with ipv4 style, bad ipv4 digits.
put("0:0:0:0:0:0:10.0.0.x", null); "0:0:0:0:0:0:10.0.0.x", null,
// Test method with ipv4 style, adjacent : // Test method with ipv4 style, adjacent :
put("0:0:0:0:0::0:10.0.0.1", null); "0:0:0:0:0::0:10.0.0.1", null,
// Test method with ipv4 style, too many ipv6 digits. // Test method with ipv4 style, too many ipv6 digits.
put("0:0:0:0:0:00000:10.0.0.1", null); "0:0:0:0:0:00000:10.0.0.1", null,
// Test method with ipv4 style, too many : // Test method with ipv4 style, too many :
put("0:0:0:0:0:0:0:10.0.0.1", null); "0:0:0:0:0:0:0:10.0.0.1", null,
// Test method with ipv4 style, not enough : // Test method with ipv4 style, not enough :
put("0:0:0:0:0:10.0.0.1", null); "0:0:0:0:0:10.0.0.1", null,
// Test method with ipv4 style, too many . // Test method with ipv4 style, too many .
put("0:0:0:0:0:0:10.0.0.0.1", null); "0:0:0:0:0:0:10.0.0.0.1", null,
// Test method with ipv4 style, not enough . // Test method with ipv4 style, not enough .
put("0:0:0:0:0:0:10.0.1", null); "0:0:0:0:0:0:10.0.1", null,
// Test method with ipv4 style, adjacent . // Test method with ipv4 style, adjacent .
put("0:0:0:0:0:0:10..0.0.1", null); "0:0:0:0:0:0:10..0.0.1", null,
// Test method with ipv4 style, leading . // Test method with ipv4 style, leading .
put("0:0:0:0:0:0:.0.0.1", null); "0:0:0:0:0:0:.0.0.1", null,
// Test method with ipv4 style, leading . // Test method with ipv4 style, leading .
put("0:0:0:0:0:0:.10.0.0.1", null); "0:0:0:0:0:0:.10.0.0.1", null,
// Test method with ipv4 style, trailing . // Test method with ipv4 style, trailing .
put("0:0:0:0:0:0:10.0.0.", null); "0:0:0:0:0:0:10.0.0.", null,
// Test method with ipv4 style, trailing . // Test method with ipv4 style, trailing .
put("0:0:0:0:0:0:10.0.0.1.", null); "0:0:0:0:0:0:10.0.0.1.", null,
// Test method with compressed ipv4 style, bad ipv6 digits. // Test method with compressed ipv4 style, bad ipv6 digits.
put("::fffx:192.168.0.1", null); "::fffx:192.168.0.1", null,
// Test method with compressed ipv4 style, bad ipv4 digits. // Test method with compressed ipv4 style, bad ipv4 digits.
put("::ffff:192.168.0.x", null); "::ffff:192.168.0.x", null,
// Test method with compressed ipv4 style, too many adjacent : // Test method with compressed ipv4 style, too many adjacent :
put(":::ffff:192.168.0.1", null); ":::ffff:192.168.0.1", null,
// Test method with compressed ipv4 style, too many ipv6 digits. // Test method with compressed ipv4 style, too many ipv6 digits.
put("::fffff:192.168.0.1", null); "::fffff:192.168.0.1", null,
// Test method with compressed ipv4 style, too many ipv4 digits. // Test method with compressed ipv4 style, too many ipv4 digits.
put("::ffff:1923.168.0.1", null); "::ffff:1923.168.0.1", null,
// Test method with compressed ipv4 style, not enough : // Test method with compressed ipv4 style, not enough :
put(":ffff:192.168.0.1", null); ":ffff:192.168.0.1", null,
// Test method with compressed ipv4 style, too many . // Test method with compressed ipv4 style, too many .
put("::ffff:192.168.0.1.2", null); "::ffff:192.168.0.1.2", null,
// Test method with compressed ipv4 style, not enough . // Test method with compressed ipv4 style, not enough .
put("::ffff:192.168.0", null); "::ffff:192.168.0", null,
// Test method with compressed ipv4 style, adjacent . // Test method with compressed ipv4 style, adjacent .
put("::ffff:192.168..0.1", null); "::ffff:192.168..0.1", null,
// Test method, garbage. // Test method, garbage.
put("absolute, and utter garbage", null); "absolute, and utter garbage", null,
// Test method, bad ipv6 digits. // Test method, bad ipv6 digits.
put("x:0:0:0:0:0:10.0.0.1", null); "x:0:0:0:0:0:10.0.0.1", null,
// Test method, bad ipv4 digits. // Test method, bad ipv4 digits.
put("0:0:0:0:0:0:x.0.0.1", null); "0:0:0:0:0:0:x.0.0.1", null,
// Test method, too many ipv6 digits. // Test method, too many ipv6 digits.
put("00000:0:0:0:0:0:10.0.0.1", null); "00000:0:0:0:0:0:10.0.0.1", null,
// Test method, too many ipv4 digits. // Test method, too many ipv4 digits.
put("0:0:0:0:0:0:10.0.0.1000", null); "0:0:0:0:0:0:10.0.0.1000", null,
// Test method, too many : // Test method, too many :
put("0:0:0:0:0:0:0:10.0.0.1", null); "0:0:0:0:0:0:0:10.0.0.1", null,
// Test method, not enough : // Test method, not enough :
put("0:0:0:0:0:10.0.0.1", null); "0:0:0:0:0:10.0.0.1", null,
// Test method, out of order trailing : // Test method, out of order trailing :
put("0:0:0:0:0:10.0.0.1:", null); "0:0:0:0:0:10.0.0.1:", null,
// Test method, out of order leading : // Test method, out of order leading :
put(":0:0:0:0:0:10.0.0.1", null); ":0:0:0:0:0:10.0.0.1", null,
// Test method, out of order leading : // Test method, out of order leading :
put("0:0:0:0::10.0.0.1:", null); "0:0:0:0::10.0.0.1:", null,
// Test method, out of order trailing : // Test method, out of order trailing :
put(":0:0:0:0::10.0.0.1", null); ":0:0:0:0::10.0.0.1", null,
// Test method, too many . // Test method, too many .
put("0:0:0:0:0:0:10.0.0.0.1", null); "0:0:0:0:0:0:10.0.0.0.1", null,
// Test method, not enough . // Test method, not enough .
put("0:0:0:0:0:0:10.0.1", null); "0:0:0:0:0:0:10.0.1", null,
// Test method, adjacent . // Test method, adjacent .
put("0:0:0:0:0:0:10.0.0..1", null); "0:0:0:0:0:0:10.0.0..1", null,
// Double compression symbol // Double compression symbol
put("::0::", null); "::0::", null,
// Empty contents // Empty contents
put("", null); "", null,
// Trailing : (max number of : = 8) // Trailing : (max number of : = 8)
put("2001:0:4136:e378:8000:63bf:3fff:fdd2:", null); "2001:0:4136:e378:8000:63bf:3fff:fdd2:", null,
// Leading : (max number of : = 8) // Leading : (max number of : = 8)
put(":aaaa:bbbb:cccc:dddd:eeee:ffff:1111:2222", null); ":aaaa:bbbb:cccc:dddd:eeee:ffff:1111:2222", null,
// Invalid character // Invalid character
put("1234:2345:3456:4567:5678:6789::X890", null); "1234:2345:3456:4567:5678:6789::X890", null,
// Trailing . in IPv4 // Trailing . in IPv4
put("::ffff:255.255.255.255.", null); "::ffff:255.255.255.255.", null,
// To many characters in IPv4 // To many characters in IPv4
put("::ffff:0.0.1111.0", null); "::ffff:0.0.1111.0", null,
// Test method, adjacent . // Test method, adjacent .
put("::ffff:0.0..0", null); "::ffff:0.0..0", null,
// Not enough IPv4 entries trailing . // Not enough IPv4 entries trailing .
put("::ffff:127.0.0.", null); "::ffff:127.0.0.", null,
// Not enough IPv4 entries no trailing . // Not enough IPv4 entries no trailing .
put("::ffff:1.2.4", null); "::ffff:1.2.4", null,
// Extra IPv4 entry // Extra IPv4 entry
put("::ffff:192.168.0.1.255", null); "::ffff:192.168.0.1.255", null,
// Not enough IPv6 content // Not enough IPv6 content
put(":ffff:192.168.0.1.255", null); ":ffff:192.168.0.1.255", null,
// Intermixed IPv4 and IPv6 symbols // Intermixed IPv4 and IPv6 symbols
put("::ffff:255.255:255.255.", null); "::ffff:255.255:255.255.", null);
}
};
private static final Map<byte[], String> ipv6ToAddressStrings = new HashMap<byte[], String>() { private static final Map<byte[], String> ipv6ToAddressStrings = new HashMap<byte[], String>() {
private static final long serialVersionUID = 2999763170377573184L; private static final long serialVersionUID = 2999763170377573184L;
{ {
// From the RFC 5952 http://tools.ietf.org/html/rfc5952#section-4 // From the RFC 5952 http://tools.ietf.org/html/rfc5952#section-4
put(new byte[]{ put(new byte[] {
32, 1, 13, -72, 32, 1, 13, -72,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 1}, 0, 0, 0, 1
"2001:db8::1"); },
put(new byte[]{ "2001:db8::1");
32, 1, 13, -72, put(new byte[] {
0, 0, 0, 0, 32, 1, 13, -72,
0, 0, 0, 0, 0, 0, 0, 0,
0, 2, 0, 1}, 0, 0, 0, 0,
"2001:db8::2:1"); 0, 2, 0, 1
put(new byte[]{ },
32, 1, 13, -72, "2001:db8::2:1");
0, 0, 0, 1, put(new byte[] {
0, 1, 0, 1, 32, 1, 13, -72,
0, 1, 0, 1}, 0, 0, 0, 1,
"2001:db8:0:1:1:1:1:1"); 0, 1, 0, 1,
0, 1, 0, 1
},
"2001:db8:0:1:1:1:1:1");
// Other examples // Other examples
put(new byte[]{ put(new byte[] {
32, 1, 13, -72, 32, 1, 13, -72,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 2, 0, 1}, 0, 2, 0, 1
"2001:db8::2:1"); },
put(new byte[]{ "2001:db8::2:1");
32, 1, 0, 0, put(new byte[] {
0, 0, 0, 1, 32, 1, 0, 0,
0, 0, 0, 0, 0, 0, 0, 1,
0, 0, 0, 1}, 0, 0, 0, 0,
"2001:0:0:1::1"); 0, 0, 0, 1
put(new byte[]{ },
32, 1, 13, -72, "2001:0:0:1::1");
0, 0, 0, 0, put(new byte[] {
0, 1, 0, 0, 32, 1, 13, -72,
0, 0, 0, 1}, 0, 0, 0, 0,
"2001:db8::1:0:0:1"); 0, 1, 0, 0,
put(new byte[]{ 0, 0, 0, 1
32, 1, 13, -72, },
0, 0, 0, 0, "2001:db8::1:0:0:1");
0, 1, 0, 0, put(new byte[] {
0, 0, 0, 0}, 32, 1, 13, -72,
"2001:db8:0:0:1::"); 0, 0, 0, 0,
put(new byte[]{ 0, 1, 0, 0,
32, 1, 13, -72, 0, 0, 0, 0
0, 0, 0, 0, },
0, 0, 0, 0, "2001:db8:0:0:1::");
0, 2, 0, 0}, put(new byte[] {
"2001:db8::2:0"); 32, 1, 13, -72,
put(new byte[]{ 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 2, 0, 0
0, 0, 0, 0, },
0, 0, 0, 1}, "2001:db8::2:0");
"::1"); put(new byte[] {
put(new byte[]{ 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 1, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 1
0, 0, 0, 1}, },
"::1:0:0:0:1"); "::1");
put(new byte[]{ put(new byte[] {
0, 0, 0, 0, 0, 0, 0, 0,
1, 0, 0, 1, 0, 0, 0, 1,
0, 0, 0, 0, 0, 0, 0, 0,
1, 0, 0, 0}, 0, 0, 0, 1
"::100:1:0:0:100:0"); },
put(new byte[]{ "::1:0:0:0:1");
32, 1, 0, 0, put(new byte[] {
65, 54, -29, 120, 0, 0, 0, 0,
-128, 0, 99, -65, 1, 0, 0, 1,
63, -1, -3, -46}, 0, 0, 0, 0,
"2001:0:4136:e378:8000:63bf:3fff:fdd2"); 1, 0, 0, 0
put(new byte[]{ },
-86, -86, -69, -69, "::100:1:0:0:100:0");
-52, -52, -35, -35, put(new byte[] {
-18, -18, -1, -1, 32, 1, 0, 0,
17, 17, 34, 34}, 65, 54, -29, 120,
"aaaa:bbbb:cccc:dddd:eeee:ffff:1111:2222"); -128, 0, 99, -65,
put(new byte[]{ 63, -1, -3, -46
0, 0, 0, 0, },
0, 0, 0, 0, "2001:0:4136:e378:8000:63bf:3fff:fdd2");
0, 0, 0, 0, put(new byte[] {
0, 0, 0, 0}, -86, -86, -69, -69,
"::"); -52, -52, -35, -35,
-18, -18, -1, -1,
17, 17, 34, 34
},
"aaaa:bbbb:cccc:dddd:eeee:ffff:1111:2222");
put(new byte[] {
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0
},
"::");
} }
}; };
private static final Map<String, String> ipv4MappedToIPv6AddressStrings = new HashMap<String, String>() { private static final Map<String, String> ipv4MappedToIPv6AddressStrings = new TestMap(
private static final long serialVersionUID = 1999763170377573184L;
{
// IPv4 addresses // IPv4 addresses
put("255.255.255.255", "::ffff:255.255.255.255"); "255.255.255.255", "::ffff:255.255.255.255",
put("0.0.0.0", "::ffff:0.0.0.0"); "0.0.0.0", "::ffff:0.0.0.0",
put("127.0.0.1", "::ffff:127.0.0.1"); "127.0.0.1", "::ffff:127.0.0.1",
put("1.2.3.4", "::ffff:1.2.3.4"); "1.2.3.4", "::ffff:1.2.3.4",
put("192.168.0.1", "::ffff:192.168.0.1"); "192.168.0.1", "::ffff:192.168.0.1",
// IPv6 addresses // IPv6 addresses
// Fully specified // Fully specified
put("2001:0:4136:e378:8000:63bf:3fff:fdd2", "2001:0:4136:e378:8000:63bf:3fff:fdd2"); "2001:0:4136:e378:8000:63bf:3fff:fdd2", "2001:0:4136:e378:8000:63bf:3fff:fdd2",
put("aaaa:bbbb:cccc:dddd:eeee:ffff:1111:2222", "aaaa:bbbb:cccc:dddd:eeee:ffff:1111:2222"); "aaaa:bbbb:cccc:dddd:eeee:ffff:1111:2222", "aaaa:bbbb:cccc:dddd:eeee:ffff:1111:2222",
put("0:0:0:0:0:0:0:0", "::"); "0:0:0:0:0:0:0:0", "::",
put("0:0:0:0:0:0:0:1", "::1"); "0:0:0:0:0:0:0:1", "::1",
// Compressing at the beginning // Compressing at the beginning
put("::1:0:0:0:1", "::1:0:0:0:1"); "::1:0:0:0:1", "::1:0:0:0:1",
put("::1:ffff:ffff", "::1:ffff:ffff"); "::1:ffff:ffff", "::1:ffff:ffff",
put("::", "::"); "::", "::",
put("::1", "::1"); "::1", "::1",
put("::ffff", "::ffff"); "::ffff", "::ffff",
put("::ffff:0", "::ffff:0"); "::ffff:0", "::ffff:0",
put("::ffff:ffff", "::ffff:ffff"); "::ffff:ffff", "::ffff:ffff",
put("::0987:9876:8765", "::987:9876:8765"); "::0987:9876:8765", "::987:9876:8765",
put("::0987:9876:8765:7654", "::987:9876:8765:7654"); "::0987:9876:8765:7654", "::987:9876:8765:7654",
put("::0987:9876:8765:7654:6543", "::987:9876:8765:7654:6543"); "::0987:9876:8765:7654:6543", "::987:9876:8765:7654:6543",
put("::0987:9876:8765:7654:6543:5432", "::987:9876:8765:7654:6543:5432"); "::0987:9876:8765:7654:6543:5432", "::987:9876:8765:7654:6543:5432",
// Note the compression is removed (rfc 5952 section 4.2.2) // Note the compression is removed (rfc 5952 section 4.2.2)
put("::0987:9876:8765:7654:6543:5432:3210", "0:987:9876:8765:7654:6543:5432:3210"); "::0987:9876:8765:7654:6543:5432:3210", "0:987:9876:8765:7654:6543:5432:3210",
// Compressing at the end // Compressing at the end
// Note the compression is removed (rfc 5952 section 4.2.2) // Note the compression is removed (rfc 5952 section 4.2.2)
put("2001:db8:abcd:bcde:cdef:def1:ef12::", "2001:db8:abcd:bcde:cdef:def1:ef12:0"); "2001:db8:abcd:bcde:cdef:def1:ef12::", "2001:db8:abcd:bcde:cdef:def1:ef12:0",
put("2001:db8:abcd:bcde:cdef:def1::", "2001:db8:abcd:bcde:cdef:def1::"); "2001:db8:abcd:bcde:cdef:def1::", "2001:db8:abcd:bcde:cdef:def1::",
put("2001:db8:abcd:bcde:cdef::", "2001:db8:abcd:bcde:cdef::"); "2001:db8:abcd:bcde:cdef::", "2001:db8:abcd:bcde:cdef::",
put("2001:db8:abcd:bcde::", "2001:db8:abcd:bcde::"); "2001:db8:abcd:bcde::", "2001:db8:abcd:bcde::",
put("2001:db8:abcd::", "2001:db8:abcd::"); "2001:db8:abcd::", "2001:db8:abcd::",
put("2001:1234::", "2001:1234::"); "2001:1234::", "2001:1234::",
put("2001::", "2001::"); "2001::", "2001::",
put("0::", "::"); "0::", "::",
// Compressing in the middle // Compressing in the middle
put("1234:2345::7890", "1234:2345::7890"); "1234:2345::7890", "1234:2345::7890",
put("1234::2345:7890", "1234::2345:7890"); "1234::2345:7890", "1234::2345:7890",
put("1234:2345:3456::7890", "1234:2345:3456::7890"); "1234:2345:3456::7890", "1234:2345:3456::7890",
put("1234:2345::3456:7890", "1234:2345::3456:7890"); "1234:2345::3456:7890", "1234:2345::3456:7890",
put("1234::2345:3456:7890", "1234::2345:3456:7890"); "1234::2345:3456:7890", "1234::2345:3456:7890",
put("1234:2345:3456:4567::7890", "1234:2345:3456:4567::7890"); "1234:2345:3456:4567::7890", "1234:2345:3456:4567::7890",
put("1234:2345:3456::4567:7890", "1234:2345:3456::4567:7890"); "1234:2345:3456::4567:7890", "1234:2345:3456::4567:7890",
put("1234:2345::3456:4567:7890", "1234:2345::3456:4567:7890"); "1234:2345::3456:4567:7890", "1234:2345::3456:4567:7890",
put("1234::2345:3456:4567:7890", "1234::2345:3456:4567:7890"); "1234::2345:3456:4567:7890", "1234::2345:3456:4567:7890",
put("1234:2345:3456:4567:5678::7890", "1234:2345:3456:4567:5678::7890"); "1234:2345:3456:4567:5678::7890", "1234:2345:3456:4567:5678::7890",
put("1234:2345:3456:4567::5678:7890", "1234:2345:3456:4567::5678:7890"); "1234:2345:3456:4567::5678:7890", "1234:2345:3456:4567::5678:7890",
put("1234:2345:3456::4567:5678:7890", "1234:2345:3456::4567:5678:7890"); "1234:2345:3456::4567:5678:7890", "1234:2345:3456::4567:5678:7890",
put("1234:2345::3456:4567:5678:7890", "1234:2345::3456:4567:5678:7890"); "1234:2345::3456:4567:5678:7890", "1234:2345::3456:4567:5678:7890",
put("1234::2345:3456:4567:5678:7890", "1234::2345:3456:4567:5678:7890"); "1234::2345:3456:4567:5678:7890", "1234::2345:3456:4567:5678:7890",
// Note the compression is removed (rfc 5952 section 4.2.2) // Note the compression is removed (rfc 5952 section 4.2.2)
put("1234:2345:3456:4567:5678:6789::7890", "1234:2345:3456:4567:5678:6789:0:7890"); "1234:2345:3456:4567:5678:6789::7890", "1234:2345:3456:4567:5678:6789:0:7890",
// Note the compression is removed (rfc 5952 section 4.2.2) // Note the compression is removed (rfc 5952 section 4.2.2)
put("1234:2345:3456:4567:5678::6789:7890", "1234:2345:3456:4567:5678:0:6789:7890"); "1234:2345:3456:4567:5678::6789:7890", "1234:2345:3456:4567:5678:0:6789:7890",
// Note the compression is removed (rfc 5952 section 4.2.2) // Note the compression is removed (rfc 5952 section 4.2.2)
put("1234:2345:3456:4567::5678:6789:7890", "1234:2345:3456:4567:0:5678:6789:7890"); "1234:2345:3456:4567::5678:6789:7890", "1234:2345:3456:4567:0:5678:6789:7890",
// Note the compression is removed (rfc 5952 section 4.2.2) // Note the compression is removed (rfc 5952 section 4.2.2)
put("1234:2345:3456::4567:5678:6789:7890", "1234:2345:3456:0:4567:5678:6789:7890"); "1234:2345:3456::4567:5678:6789:7890", "1234:2345:3456:0:4567:5678:6789:7890",
// Note the compression is removed (rfc 5952 section 4.2.2) // Note the compression is removed (rfc 5952 section 4.2.2)
put("1234:2345::3456:4567:5678:6789:7890", "1234:2345:0:3456:4567:5678:6789:7890"); "1234:2345::3456:4567:5678:6789:7890", "1234:2345:0:3456:4567:5678:6789:7890",
// Note the compression is removed (rfc 5952 section 4.2.2) // Note the compression is removed (rfc 5952 section 4.2.2)
put("1234::2345:3456:4567:5678:6789:7890", "1234:0:2345:3456:4567:5678:6789:7890"); "1234::2345:3456:4567:5678:6789:7890", "1234:0:2345:3456:4567:5678:6789:7890",
// IPv4 mapped addresses // IPv4 mapped addresses
put("::ffff:255.255.255.255", "::ffff:255.255.255.255"); "::ffff:255.255.255.255", "::ffff:255.255.255.255",
put("::ffff:0.0.0.0", "::ffff:0.0.0.0"); "::ffff:0.0.0.0", "::ffff:0.0.0.0",
put("::ffff:127.0.0.1", "::ffff:127.0.0.1"); "::ffff:127.0.0.1", "::ffff:127.0.0.1",
put("::ffff:1.2.3.4", "::ffff:1.2.3.4"); "::ffff:1.2.3.4", "::ffff:1.2.3.4",
put("::ffff:192.168.0.1", "::ffff:192.168.0.1"); "::ffff:192.168.0.1", "::ffff:192.168.0.1");
}
};
@Test @Test
public void testLocalhost() { public void testLocalhost() {
@ -523,41 +437,40 @@ public class NetUtilTest {
@Test @Test
public void testCreateByteArrayFromIpAddressString() { public void testCreateByteArrayFromIpAddressString() {
for (Entry<String, byte[]> stringEntry : validIpV4Hosts.entrySet()) { for (Entry<String, String> e : validIpV4Hosts.entrySet()) {
assertArrayEquals(stringEntry.getValue(), NetUtil.createByteArrayFromIpAddressString(stringEntry.getKey())); assertHexDumpEquals(e.getValue(), NetUtil.createByteArrayFromIpAddressString(e.getKey()));
} }
for (Entry<String, byte[]> stringEntry : invalidIpV4Hosts.entrySet()) { for (Entry<String, String> e : invalidIpV4Hosts.entrySet()) {
assertArrayEquals(stringEntry.getValue(), NetUtil.createByteArrayFromIpAddressString(stringEntry.getKey())); assertHexDumpEquals(e.getValue(), NetUtil.createByteArrayFromIpAddressString(e.getKey()));
} }
for (Entry<String, byte[]> stringEntry : validIpV6Hosts.entrySet()) { for (Entry<String, String> e : validIpV6Hosts.entrySet()) {
assertArrayEquals(stringEntry.getValue(), NetUtil.createByteArrayFromIpAddressString(stringEntry.getKey())); assertHexDumpEquals(e.getValue(), NetUtil.createByteArrayFromIpAddressString(e.getKey()));
} }
for (Entry<String, byte[]> stringEntry : invalidIpV6Hosts.entrySet()) { for (Entry<String, String> e : invalidIpV6Hosts.entrySet()) {
assertArrayEquals(stringEntry.getValue(), NetUtil.createByteArrayFromIpAddressString(stringEntry.getKey())); assertHexDumpEquals(e.getValue(), NetUtil.createByteArrayFromIpAddressString(e.getKey()));
} }
} }
@Test @Test
public void testIp6AddressToString() throws UnknownHostException { public void testIp6AddressToString() throws UnknownHostException {
for (Entry<byte[], String> testEntry : ipv6ToAddressStrings.entrySet()) { for (Entry<byte[], String> testEntry : ipv6ToAddressStrings.entrySet()) {
assertEquals(testEntry.getValue(), assertEquals(testEntry.getValue(), NetUtil.toAddressString(InetAddress.getByAddress(testEntry.getKey())));
NetUtil.toAddressString(InetAddress.getByAddress(testEntry.getKey())));
} }
} }
@Test @Test
public void testIp4AddressToString() throws UnknownHostException { public void testIp4AddressToString() throws UnknownHostException {
for (Entry<String, byte[]> stringEntry : validIpV4Hosts.entrySet()) { for (Entry<String, String> e : validIpV4Hosts.entrySet()) {
assertEquals(stringEntry.getKey(), assertEquals(e.getKey(), NetUtil.toAddressString(InetAddress.getByAddress(unhex(e.getValue()))));
NetUtil.toAddressString(InetAddress.getByAddress(stringEntry.getValue())));
} }
} }
@Test @Test
public void testIpv4MappedIp6GetByName() { public void testIpv4MappedIp6GetByName() {
for (Entry<String, String> testEntry : ipv4MappedToIPv6AddressStrings.entrySet()) { for (Entry<String, String> testEntry : ipv4MappedToIPv6AddressStrings.entrySet()) {
assertEquals(testEntry.getValue(), assertEquals(
NetUtil.toAddressString(NetUtil.getByName(testEntry.getKey(), true), true)); testEntry.getValue(),
NetUtil.toAddressString(NetUtil.getByName(testEntry.getKey(), true), true));
} }
} }
@ -571,4 +484,37 @@ public class NetUtilTest {
assertNull(NetUtil.getByName(testEntry, true)); assertNull(NetUtil.getByName(testEntry, true));
} }
} }
private static void assertHexDumpEquals(String expected, byte[] actual) {
assertEquals(expected, hex(actual));
}
private static String hex(byte[] value) {
if (value == null) {
return null;
}
StringBuilder buf = new StringBuilder(value.length << 1);
for (byte b: value) {
String hex = Integer.toHexString(b & 0xFF);
if (hex.length() == 1) {
buf.append('0');
}
buf.append(hex);
}
return buf.toString();
}
private static byte[] unhex(String value) {
if (value == null) {
return null;
}
byte[] buf = new byte[value.length() >>> 1];
for (int i = 0; i < buf.length; i ++) {
buf[i] = (byte) Integer.parseInt(value.substring(i << 1, i + 1 << 1), 16);
}
return buf;
}
} }