Skip to content

fix DoH error when using ip address as hostname #7073

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

Merged
swankjesse merged 10 commits into from
Feb 16, 2022
Merged

fix DoH error when using ip address as hostname #7073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f74fa03
fix DoH error when using ip address as hostname
TaoZang Feb 11, 2022
37be7f2
lookup hostname first and try to parse as IP address only when lookup…
TaoZang Feb 11, 2022
f26f1cd
add unit test in DnsOverHttpsTest for the case that Doing DNS lookup …
TaoZang Feb 12, 2022
1adcb89
use simpler ipAddress check instead of complex support functions
TaoZang Feb 14, 2022
2cf4de1
add test case for some special ipv6 addresses
TaoZang Feb 15, 2022
47f50f5
use existing ipAddress check functions instead of adding a new simila…
TaoZang Feb 15, 2022
d0fb591
avoid to do dns lookup when the hostname is already an IP address
TaoZang Feb 16, 2022
8158e31
code style update
TaoZang Feb 16, 2022
d9bb9fd
add test case
TaoZang Feb 16, 2022
9614b50
use loopback address instead of localhost
TaoZang Feb 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions okhttp/src/jvmMain/kotlin/okhttp3/internal/connection/RouteSelector.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
package okhttp3.internal.connection

import java.io.IOException
import java.net.InetAddress
import java.net.InetSocketAddress
import java.net.Proxy
import java.net.SocketException
Expand All @@ -26,6 +27,7 @@ import okhttp3.Call
import okhttp3.EventListener
import okhttp3.HttpUrl
import okhttp3.Route
import okhttp3.internal.canParseAsIpAddress
import okhttp3.internal.immutableListOf
import okhttp3.internal.toImmutableList

Expand Down Expand Up @@ -159,15 +161,20 @@ class RouteSelector(
if (proxy.type() == Proxy.Type.SOCKS) {
mutableInetSocketAddresses += InetSocketAddress.createUnresolved(socketHost, socketPort)
} else {
eventListener.dnsStart(call, socketHost)
val addresses = if (socketHost.canParseAsIpAddress()) {
listOf(InetAddress.getByName(socketHost))
} else {
eventListener.dnsStart(call, socketHost)
Copy link
Collaborator

@yschimke yschimke Feb 16, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems like a nice benefit of this change. that DNS start event isn't emitted for an IP address.


val result = address.dns.lookup(socketHost)
if (result.isEmpty()) {
throw UnknownHostException("${address.dns} returned no addresses for $socketHost")
}

val addresses = address.dns.lookup(socketHost)
if (addresses.isEmpty()) {
throw UnknownHostException("${address.dns} returned no addresses for $socketHost")
eventListener.dnsEnd(call, socketHost, result)
result
}

eventListener.dnsEnd(call, socketHost, addresses)

// Try each address for best behavior in mixed IPv4/IPv6 environments.
val orderedAddresses = when {
fastFallback -> reorderForHappyEyeballs(addresses)
Expand Down
21 changes: 21 additions & 0 deletions okhttp/src/jvmTest/java/okhttp3/EventListenerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,27 @@ public final class EventListenerTest {
"ResponseBodyEnd", "ConnectionReleased", "CallEnd");
}

@Test public void successfulCallEventSequenceForIpAddress() throws IOException {
server.enqueue(new MockResponse()
.setBody("abc"));

String ipAddress = InetAddress.getLoopbackAddress().getHostAddress();

Call call = client.newCall(new Request.Builder()
.url(server.url("/").newBuilder().host(ipAddress).build())
.build());
Response response = call.execute();
assertThat(response.code()).isEqualTo(200);
assertThat(response.body().string()).isEqualTo("abc");
response.body().close();

assertThat(listener.recordedEventTypes()).containsExactly("CallStart",
"ProxySelectStart", "ProxySelectEnd",
"ConnectStart", "ConnectEnd", "ConnectionAcquired", "RequestHeadersStart",
"RequestHeadersEnd", "ResponseHeadersStart", "ResponseHeadersEnd", "ResponseBodyStart",
"ResponseBodyEnd", "ConnectionReleased", "CallEnd");
}

@Test public void successfulCallEventSequenceForEnqueue() throws Exception {
server.enqueue(new MockResponse()
.setBody("abc"));
Expand Down