Skip to content
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

Jump to bottom

Ensure DnsNameResolver resolves the host(computer) name on Windows #11167

Merged
merged 2 commits into from Apr 20, 2021
Merged

Ensure DnsNameResolver resolves the host(computer) name on Windows #11167

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d26815e
Ensure DnsNameResolver resolves the host(computer) name on Windows
violetagg Apr 19, 2021
41a7e9d
Address feedback
violetagg Apr 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 14 additions & 1 deletion resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolver.java
View file
Open in desktop
Expand Up @@ -91,6 +91,7 @@ public class DnsNameResolver extends InetNameResolver {

private static final InternalLogger logger = InternalLoggerFactory.getInstance(DnsNameResolver.class);
private static final String LOCALHOST = "localhost";
private static final String HOST_NAME;
normanmaurer marked this conversation as resolved.
Show resolved Hide resolved
private static final InetAddress LOCALHOST_ADDRESS;
private static final DnsRecord[] EMPTY_ADDITIONALS = new DnsRecord[0];
private static final DnsRecordType[] IPV4_ONLY_RESOLVED_RECORD_TYPES =
Expand Down Expand Up @@ -127,6 +128,14 @@ public class DnsNameResolver extends InetNameResolver {
LOCALHOST_ADDRESS = NetUtil.LOCALHOST4;
}
}

String hostName;
try {
hostName = PlatformDependent.isWindows() ? InetAddress.getLocalHost().getHostName() : null;
} catch (Exception ignore) {
hostName = null;
}
HOST_NAME = hostName;
}

static {
Expand Down Expand Up @@ -686,10 +695,14 @@ private InetAddress resolveHostsFileEntry(String hostname) {
return null;
} else {
InetAddress address = hostsFileEntriesResolver.address(hostname, resolvedAddressTypes);
if (address == null && PlatformDependent.isWindows() && LOCALHOST.equalsIgnoreCase(hostname)) {
if (address == null && PlatformDependent.isWindows() &&
(LOCALHOST.equalsIgnoreCase(hostname) ||
(HOST_NAME != null && HOST_NAME.equalsIgnoreCase(hostname)))) {
// If we tried to resolve localhost we need workaround that windows removed localhost from its
// hostfile in later versions.
// See https://github.com/netty/netty/issues/5386
// Need a workaround for resolving the host (computer) name in case it cannot be resolved from hostfile
// See https://github.com/netty/netty/issues/11142
return LOCALHOST_ADDRESS;
}
return address;
Expand Down
70 changes: 70 additions & 0 deletions resolver-dns/src/test/java/io/netty/resolver/dns/DnsNameResolverTest.java
View file
Open in desktop
Expand Up @@ -110,8 +110,10 @@
import static io.netty.handler.codec.dns.DnsRecordType.AAAA;
import static io.netty.handler.codec.dns.DnsRecordType.CNAME;
import static io.netty.handler.codec.dns.DnsRecordType.SRV;
import static io.netty.resolver.dns.DnsNameResolver.DEFAULT_RESOLVE_ADDRESS_TYPES;
import static io.netty.resolver.dns.DnsServerAddresses.sequential;
import static java.util.Collections.singletonList;
import static org.assertj.core.api.Assumptions.assumeThat;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.hasSize;
Expand Down Expand Up @@ -319,6 +321,18 @@ public class DnsNameResolverTest {
StringUtil.EMPTY_STRING);
}

private static final String HOST_NAME;

static {
String hostName;
try {
hostName = PlatformDependent.isWindows() ? InetAddress.getLocalHost().getHostName() : null;
} catch (Exception ignore) {
hostName = null;
}
HOST_NAME = hostName;
}

private static final TestDnsServer dnsServer = new TestDnsServer(DOMAINS_ALL);
private static final EventLoopGroup group = new NioEventLoopGroup(1);

Expand Down Expand Up @@ -743,6 +757,34 @@ public void testResolveEmptyIpv6() {
testResolve0(ResolvedAddressTypes.IPV6_ONLY, NetUtil.LOCALHOST6, StringUtil.EMPTY_STRING);
}

@Test
public void testResolveLocalhostIpv4() {
assumeThat(PlatformDependent.isWindows()).isTrue();
assumeThat(DEFAULT_RESOLVE_ADDRESS_TYPES).isNotEqualTo(ResolvedAddressTypes.IPV6_PREFERRED);
testResolve0(ResolvedAddressTypes.IPV4_ONLY, NetUtil.LOCALHOST4, "localhost");
}

@Test
public void testResolveLocalhostIpv6() {
assumeThat(PlatformDependent.isWindows()).isTrue();
assumeThat(DEFAULT_RESOLVE_ADDRESS_TYPES).isEqualTo(ResolvedAddressTypes.IPV6_PREFERRED);
testResolve0(ResolvedAddressTypes.IPV6_ONLY, NetUtil.LOCALHOST6, "localhost");
}

@Test
public void testResolveHostNameIpv4() {
assumeThat(PlatformDependent.isWindows()).isTrue();
assumeThat(DEFAULT_RESOLVE_ADDRESS_TYPES).isNotEqualTo(ResolvedAddressTypes.IPV6_PREFERRED);
testResolve0(ResolvedAddressTypes.IPV4_ONLY, NetUtil.LOCALHOST4, HOST_NAME);
}

@Test
public void testResolveHostNameIpv6() {
assumeThat(PlatformDependent.isWindows()).isTrue();
assumeThat(DEFAULT_RESOLVE_ADDRESS_TYPES).isEqualTo(ResolvedAddressTypes.IPV6_PREFERRED);
testResolve0(ResolvedAddressTypes.IPV6_ONLY, NetUtil.LOCALHOST6, HOST_NAME);
}

@Test
public void testResolveNullIpv4() {
testResolve0(ResolvedAddressTypes.IPV4_ONLY, NetUtil.LOCALHOST4, null);
Expand Down Expand Up @@ -776,6 +818,34 @@ public void testResolveAllEmptyIpv6() {
testResolveAll0(ResolvedAddressTypes.IPV6_ONLY, NetUtil.LOCALHOST6, StringUtil.EMPTY_STRING);
}

@Test
public void testResolveAllLocalhostIpv4() {
assumeThat(PlatformDependent.isWindows()).isTrue();
assumeThat(DEFAULT_RESOLVE_ADDRESS_TYPES).isNotEqualTo(ResolvedAddressTypes.IPV6_PREFERRED);
testResolveAll0(ResolvedAddressTypes.IPV4_ONLY, NetUtil.LOCALHOST4, "localhost");
}

@Test
public void testResolveAllLocalhostIpv6() {
assumeThat(PlatformDependent.isWindows()).isTrue();
assumeThat(DEFAULT_RESOLVE_ADDRESS_TYPES).isEqualTo(ResolvedAddressTypes.IPV6_PREFERRED);
testResolveAll0(ResolvedAddressTypes.IPV6_ONLY, NetUtil.LOCALHOST6, "localhost");
}

@Test
public void testResolveAllHostNameIpv4() {
assumeThat(PlatformDependent.isWindows()).isTrue();
assumeThat(DEFAULT_RESOLVE_ADDRESS_TYPES).isNotEqualTo(ResolvedAddressTypes.IPV6_PREFERRED);
testResolveAll0(ResolvedAddressTypes.IPV4_ONLY, NetUtil.LOCALHOST4, HOST_NAME);
}

@Test
public void testResolveAllHostNameIpv6() {
assumeThat(PlatformDependent.isWindows()).isTrue();
assumeThat(DEFAULT_RESOLVE_ADDRESS_TYPES).isEqualTo(ResolvedAddressTypes.IPV6_PREFERRED);
testResolveAll0(ResolvedAddressTypes.IPV6_ONLY, NetUtil.LOCALHOST6, HOST_NAME);
}

@Test
public void testCNAMEResolveAllIpv4() throws IOException {
testCNAMERecursiveResolve(true);
Expand Down