opendev/gerrit
Code Issues Proposed changes

Test SocketUtil class

Browse Source 
We've had bugs in this parsing/formatting code before, so test it
to ensure it behaves in a way we can predict it should.

Change-Id: I9cc6af7281cba0271ee26357a2400ce647d79783
Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce
2009-12-17 13:11:50 -08:00
parent 5356ce5279
commit 0b96d3ebe3
2 changed files with 142 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
gerrit-server/src/main/java/com/google/gerrit/server/util/SocketUtil.java
View File

@@ -23,7 +23,8 @@ import java.net.UnknownHostException;
public final class SocketUtil {
/** True if this InetAddress is a raw IPv6 in dotted quad notation. */
public static boolean isIPv6(final InetAddress ip) {
return ip instanceof Inet6Address && ip.getHostName().equals(ip.getHostAddress());
return ip instanceof Inet6Address
&& ip.getHostName().equals(ip.getHostAddress());
}
/** Get the name or IP address, or {@code *} if this address is a wildcard IP. */
@@ -41,6 +42,9 @@ public final class SocketUtil {
public static String format(final SocketAddress s, final int defaultPort) {
if (s instanceof InetSocketAddress) {
final InetSocketAddress addr = (InetSocketAddress) s;
if (addr.getPort() == defaultPort) {
return safeHostname(hostname(addr));
}
return format(hostname(addr), addr.getPort());
}
return s.toString();
@@ -48,10 +52,14 @@ public final class SocketUtil {
/** Format an address string into {@code host:port} or {@code *:port} syntax. */
public static String format(String hostname, int port) {
return safeHostname(hostname) + ":" + port;
}
private static String safeHostname(String hostname) {
if (0 <= hostname.indexOf(':')) {
hostname = "[" + hostname + "]";
}
return hostname + ":" + port;
return hostname;
}
/** Parse an address string such as {@code host:port} or {@code *:port}. */
@@ -64,7 +72,7 @@ public final class SocketUtil {
//
final int hostEnd = desc.indexOf(']');
if (hostEnd < 0) {
throw new IllegalArgumentException("invalid IPv6 representation");
throw new IllegalArgumentException("invalid IPv6: " + desc);
}
hostStr = desc.substring(1, hostEnd);
@@ -89,7 +97,7 @@ public final class SocketUtil {
try {
port = Integer.parseInt(portStr);
} catch (NumberFormatException e) {
throw new IllegalArgumentException("invalid port");
throw new IllegalArgumentException("invalid port: " + desc);
}
} else {
port = defaultPort;
@@ -103,7 +111,8 @@ public final class SocketUtil {
}
/** Parse and resolve an address string, looking up the IP address. */
public static InetSocketAddress resolve(final String desc, final int defaultPort) {
public static InetSocketAddress resolve(final String desc,
final int defaultPort) {
final InetSocketAddress addr = parse(desc, defaultPort);
if (addr.getAddress() != null && addr.getAddress().isAnyLocalAddress()) {
return addr;
@@ -113,7 +122,7 @@ public final class SocketUtil {
final InetAddress host = InetAddress.getByName(addr.getHostName());
return new InetSocketAddress(host, addr.getPort());
} catch (UnknownHostException e) {
throw new IllegalArgumentException(e.getMessage(), e);
throw new IllegalArgumentException("unknown host: " + desc, e);
}
}
}