|
@@ -54,9 +54,9 @@ import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
//this will need to be replaced someday when there is a suitable replacement
|
|
|
import sun.net.dns.ResolverConfiguration;
|
|
|
-import sun.net.util.IPAddressUtil;
|
|
|
|
|
|
import com.google.common.annotations.VisibleForTesting;
|
|
|
+import com.google.common.net.InetAddresses;
|
|
|
|
|
|
/**
|
|
|
* Security Utils.
|
|
@@ -604,14 +604,11 @@ public final class SecurityUtil {
|
|
|
public InetAddress getByName(String host) throws UnknownHostException {
|
|
|
InetAddress addr = null;
|
|
|
|
|
|
- if (IPAddressUtil.isIPv4LiteralAddress(host)) {
|
|
|
- // use ipv4 address as-is
|
|
|
- byte[] ip = IPAddressUtil.textToNumericFormatV4(host);
|
|
|
- addr = InetAddress.getByAddress(host, ip);
|
|
|
- } else if (IPAddressUtil.isIPv6LiteralAddress(host)) {
|
|
|
- // use ipv6 address as-is
|
|
|
- byte[] ip = IPAddressUtil.textToNumericFormatV6(host);
|
|
|
- addr = InetAddress.getByAddress(host, ip);
|
|
|
+ if (InetAddresses.isInetAddress(host)) {
|
|
|
+ // valid ip address. use it as-is
|
|
|
+ addr = InetAddresses.forString(host);
|
|
|
+ // set hostname
|
|
|
+ addr = InetAddress.getByAddress(host, addr.getAddress());
|
|
|
} else if (host.endsWith(".")) {
|
|
|
// a rooted host ends with a dot, ex. "host."
|
|
|
// rooted hosts never use the search path, so only try an exact lookup
|