Add EchAwareDns for Android 37#9596
Open
yschimke wants to merge 5 commits into
Open
Conversation
swankjesse
approved these changes
Jul 25, 2026
| allJvmArgs = allJvmArgs.filter { !it.startsWith("--add-opens") } | ||
| } else { | ||
| // Robolectric's FileDescriptor interceptor reaches into jdk.internal.access, which isn't | ||
| // exported to the unnamed module. Android 17 (API 37) images hit it on startup. |
| @SuppressSignatureCheck | ||
| @RunWith(RobolectricTestRunner::class) | ||
| @Config(sdk = [37], shadows = [ShadowNetworkSecurityPolicy::class]) | ||
| class EchAwareDnsTest { |
| val records = echAwareDns(newNetworkSecurityPolicy()).recordsFor("publicobject.com") | ||
|
|
||
| assertThat(records.addresses()).containsExactly(addressOnlyAddress) | ||
| assertThat(records.echConfigLists()).isEmpty() |
swankjesse
reviewed
Jul 25, 2026
| internal var cookieJar: CookieJar = CookieJar.NO_COOKIES | ||
| internal var cache: Cache? = null | ||
| internal var dns: Dns = Dns.SYSTEM | ||
| internal var dns: Dns = Platform.get().platformDns() |
Collaborator
There was a problem hiding this comment.
I think we should actually change Dns.System to do this
Collaborator
Author
There was a problem hiding this comment.
I'm not sure, I think of Dns.SYSTEM as InetAddress.getAllByName(hostname)
And it's a field so awkward with lazy init.
/**
* A DNS that uses [InetAddress.getAllByName] to ask the underlying operating system to
* lookup IP addresses. Most custom [Dns] implementations should delegate to this instance.
*/
@JvmField
val SYSTEM: Dns = DnsSystem()
yschimke
marked this pull request as ready for review
July 25, 2026 21:51
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Adds EchAwareDns which reads the API 37 NetworkSecurityPolicy and decides how to handle Dns depending on domain encryption per hostname (ECH).