Skip to content

Add ECH service metadata to Route. #9556

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 3 commits into from
Jul 17, 2026
Merged

Add ECH service metadata to Route. #9556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a7d7fb
Add ECH service metadata to Route.
swankjesse Jul 17, 2026
947c097
Fixup tests
swankjesse Jul 17, 2026
4355281
Test DNS returning zero results
swankjesse Jul 17, 2026
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
1 change: 1 addition & 0 deletions build-logic/src/main/kotlin/okhttp.jvm-conventions.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ tasks.withType<KotlinCompile> {
"-Xjvm-default=all",
"-Xexpect-actual-classes",
)
optIn.add("okhttp3.internal.OkHttpInternalApi")
}
}

Expand Down
5 changes: 3 additions & 2 deletions build-logic/src/main/kotlin/okhttp.publish-conventions.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,12 @@ configure<MavenPublishBaseExtension> {
}

configure<ApiValidationExtension> {
ignoredPackages += "okhttp3.logging.internal"
ignoredPackages += "mockwebserver3.internal"
ignoredPackages += "okhttp3.internal"
ignoredPackages += "mockwebserver3.junit5.internal"
ignoredPackages += "okhttp3.brotli.internal"
ignoredPackages += "okhttp3.dnsoverhttps.internal"
ignoredPackages += "okhttp3.internal"
ignoredPackages += "okhttp3.logging.internal"
ignoredPackages += "okhttp3.sse.internal"
ignoredPackages += "okhttp3.tls.internal"
}
Expand Down
9 changes: 9 additions & 0 deletions okhttp-dnsoverhttps/src/main/kotlin/okhttp3/dnsoverhttps/DnsOverHttps.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,15 @@ import okhttp3.MediaType.Companion.toMediaType
import okhttp3.OkHttpClient
import okhttp3.Request
import okhttp3.Response
import okhttp3.dnsoverhttps.internal.DnsMessage
import okhttp3.dnsoverhttps.internal.DnsOverHttpsCall
import okhttp3.dnsoverhttps.internal.QueryRequestBody
import okhttp3.dnsoverhttps.internal.ResourceRecord
import okhttp3.dnsoverhttps.internal.TYPE_A
import okhttp3.dnsoverhttps.internal.TYPE_AAAA
import okhttp3.dnsoverhttps.internal.TYPE_HTTPS
import okhttp3.dnsoverhttps.internal.asQueryParameter
import okhttp3.dnsoverhttps.internal.decodeResponse
import okhttp3.internal.publicsuffix.PublicSuffixDatabase

/**
Expand Down
24 changes: 16 additions & 8 deletions ...otlin/okhttp3/dnsoverhttps/-DnsMessage.kt → ...ttp3/dnsoverhttps/internal/-DnsMessage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
@file:Suppress("ktlint:standard:filename")

package okhttp3.dnsoverhttps
package okhttp3.dnsoverhttps.internal

import java.io.IOException
import java.net.InetAddress
Expand All @@ -26,12 +26,14 @@ import okhttp3.RequestBody
import okhttp3.Response
import okhttp3.dnsoverhttps.DnsOverHttps.Companion.DNS_MESSAGE
import okhttp3.dnsoverhttps.DnsOverHttps.Companion.MAX_RESPONSE_SIZE
import okhttp3.internal.OkHttpInternalApi
import okhttp3.internal.platform.Platform
import okio.Buffer
import okio.BufferedSink
import okio.ByteString

internal data class DnsMessage(
@OkHttpInternalApi
data class DnsMessage(
val id: Short,
val flags: Int,
val questions: List<Question>,
Expand Down Expand Up @@ -79,7 +81,7 @@ internal data class DnsMessage(
}
}

internal data class Question(
data class Question(
val name: String,
val type: Int,
val `class`: Int = CLASS_IN,
Expand All @@ -94,7 +96,7 @@ internal data class Question(
}
}

internal sealed interface ResourceRecord {
sealed interface ResourceRecord {
val name: String
val timeToLive: Int

Expand Down Expand Up @@ -140,12 +142,18 @@ internal sealed interface ResourceRecord {
}

/** https://www.iana.org/assignments/dns-parameters/dns-parameters.xhtml#dns-parameters-4 */
internal const val TYPE_A = 1
internal const val TYPE_AAAA = 28
internal const val TYPE_HTTPS = 65
@OkHttpInternalApi
const val TYPE_A = 1

@OkHttpInternalApi
const val TYPE_AAAA = 28

@OkHttpInternalApi
const val TYPE_HTTPS = 65

/** https://www.iana.org/assignments/dns-parameters/dns-parameters.xhtml#dns-parameters-2 */
internal const val CLASS_IN = 1
@OkHttpInternalApi
const val CLASS_IN = 1

/** https://www.iana.org/assignments/dns-parameters/dns-parameters.xhtml#dns-parameters-6 */
internal const val RESPONSE_CODE_SUCCESS = 0
Expand Down
6 changes: 4 additions & 2 deletions ...okhttp3/dnsoverhttps/-DnsMessageReader.kt → ...nsoverhttps/internal/-DnsMessageReader.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@
*/
@file:Suppress("ktlint:standard:filename")

package okhttp3.dnsoverhttps
package okhttp3.dnsoverhttps.internal

import java.net.InetAddress
import okhttp3.Protocol
import okhttp3.internal.OkHttpInternalApi
import okio.Buffer
import okio.BufferedSource
import okio.ByteString
Expand All @@ -33,7 +34,8 @@ import okio.buffer
*
* https://datatracker.ietf.org/doc/html/rfc1035
*/
internal class DnsMessageReader(
@OkHttpInternalApi
class DnsMessageReader(
source: BufferedSource,
) {
/**
Expand Down
6 changes: 4 additions & 2 deletions ...okhttp3/dnsoverhttps/-DnsMessageWriter.kt → ...nsoverhttps/internal/-DnsMessageWriter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@
*/
@file:Suppress("ktlint:standard:filename")

package okhttp3.dnsoverhttps
package okhttp3.dnsoverhttps.internal

import java.net.Inet4Address
import java.net.Inet6Address
import okhttp3.Protocol
import okhttp3.internal.OkHttpInternalApi
import okio.Buffer
import okio.ByteString
import okio.ByteString.Companion.encodeUtf8
Expand All @@ -30,7 +31,8 @@ import okio.utf8Size
*
* https://datatracker.ietf.org/doc/html/rfc1035
*/
internal class DnsMessageWriter(
@OkHttpInternalApi
class DnsMessageWriter(
private val sink: Buffer,
) {
/**
Expand Down
4 changes: 2 additions & 2 deletions ...okhttp3/dnsoverhttps/-DnsOverHttpsCall.kt → ...nsoverhttps/internal/-DnsOverHttpsCall.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@
* limitations under the License.
*/
@file:Suppress("ktlint:standard:filename")
@file:OptIn(OkHttpInternalApi::class)

package okhttp3.dnsoverhttps
package okhttp3.dnsoverhttps.internal

import java.io.IOException
import java.util.concurrent.atomic.AtomicReference
Expand All @@ -35,6 +34,7 @@ import okhttp3.internal.testAndSet
/**
* Implements [Dns.Call] by making multiple HTTPS calls.
*/
@OkHttpInternalApi
internal class DnsOverHttpsCall(
override val request: Dns.Request,
private val calls: List<Call>,
Expand Down
141 changes: 0 additions & 141 deletions okhttp-dnsoverhttps/src/test/java/okhttp3/dnsoverhttps/DnsOverHttpsServer.kt
View file
Open in desktop

This file was deleted.

Loading
Loading