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

Avoid NPE in ConnectPlan #8514

Merged
merged 5 commits into from
Nov 19, 2024
Merged

Avoid NPE in ConnectPlan #8514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift click to select a range
eb73840
Avoid NPE in ConnectPlan
yschimke Aug 17, 2024
c3685b3
Avoid NPE in ConnectPlan
yschimke Aug 17, 2024
5a5b04d
Avoid NPE in ConnectPlan
yschimke Aug 17, 2024
a931bd0
cleanup
yschimke Aug 17, 2024
c47157f
Merge branch 'master' into avoid_npe
yschimke Aug 17, 2024
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
16 changes: 7 additions & 9 deletions okhttp/src/main/kotlin/okhttp3/internal/connection/ConnectPlan.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 94,8 @@ class ConnectPlan(
internal var socket: Socket? = null
private var handshake: Handshake? = null
private var protocol: Protocol? = null
private var source: BufferedSource? = null
private var sink: BufferedSink? = null
private lateinit var source: BufferedSource
private lateinit var sink: BufferedSink
private var connection: RealConnection? = null

/** True if this connection is ready for use, including TCP, tunnels, and TLS. */
Expand Down Expand Up @@ -153,7 153,7 @@ class ConnectPlan(
}

override fun connectTlsEtc(): ConnectResult {
check(rawSocket != null) { "TCP not connected" }
val rawSocket = requireNotNull(rawSocket) { "TCP not connected" }
check(!isReady) { "already connected" }

val connectionSpecs = route.address.connectionSpecs
Expand All @@ -177,7 177,7 @@ class ConnectPlan(
// that happens, then we will have buffered bytes that are needed by the SSLSocket!
// This check is imperfect: it doesn't tell us whether a handshake will succeed, just
// that it will almost certainly fail because the proxy has sent unexpected data.
if (source?.buffer?.exhausted() == false || sink?.buffer?.exhausted() == false) {
if (!source.buffer.exhausted() || !sink.buffer.exhausted()) {
throw IOException("TLS tunnel buffered too many bytes!")
}

Expand Down Expand Up @@ -217,9 217,9 @@ class ConnectPlan(
connectionPool = connectionPool,
route = route,
rawSocket = rawSocket,
socket = socket,
socket = socket!!,
handshake = handshake,
protocol = protocol,
protocol = protocol!!,
source = source,
sink = sink,
pingIntervalMillis = pingIntervalMillis,
Expand Down Expand Up @@ -248,7 248,7 @@ class ConnectPlan(
user.removePlanToCancel(this)
if (!success) {
socket?.closeQuietly()
rawSocket?.closeQuietly()
rawSocket.closeQuietly()
}
}
}
Expand Down Expand Up @@ -421,8 421,6 @@ class ConnectPlan(
val url = route.address.url
val requestLine = "CONNECT ${url.toHostHeader(includeDefaultPort = true)} HTTP/1.1"
while (true) {
val source = this.source!!
val sink = this.sink!!
val tunnelCodec =
Http1ExchangeCodec(
// No client for CONNECT tunnels:
Expand Down
75 changes: 48 additions & 27 deletions okhttp/src/main/kotlin/okhttp3/internal/connection/RealConnection.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 54,13 @@ import okhttp3.internal.http2.StreamResetException
import okhttp3.internal.isHealthy
import okhttp3.internal.tls.OkHostnameVerifier
import okhttp3.internal.ws.RealWebSocket
import okio.Buffer
import okio.BufferedSink
import okio.BufferedSource
import okio.Sink
import okio.Source
import okio.Timeout
import okio.buffer

/**
* A connection to a remote web server capable of carrying 1 or more concurrent streams.
Expand All @@ -68,16 73,16 @@ class RealConnection(
val connectionPool: RealConnectionPool,
override val route: Route,
/** The low-level TCP socket. */
private var rawSocket: Socket?,
private val rawSocket: Socket,
/**
* The application layer socket. Either an [SSLSocket] layered over [rawSocket], or [rawSocket]
* itself if this connection does not use SSL.
*/
private var socket: Socket?,
private var handshake: Handshake?,
private var protocol: Protocol?,
private var source: BufferedSource?,
private var sink: BufferedSink?,
private val socket: Socket,
private val handshake: Handshake?,
private val protocol: Protocol,
private val source: BufferedSource,
private val sink: BufferedSink,
private val pingIntervalMillis: Int,
internal val connectionListener: ConnectionListener,
) : Http2Connection.Listener(), Connection, ExchangeCodec.Carrier {
Expand Down Expand Up @@ -163,9 168,6 @@ class RealConnection(

@Throws(IOException::class)
private fun startHttp2() {
val socket = this.socket!!
val source = this.source!!
val sink = this.sink!!
socket.soTimeout = 0 // HTTP/2 connection timeouts are set per-stream.
val flowControlListener = connectionListener as? FlowControlListener ?: FlowControlListener.None
val http2Connection =
Expand Down Expand Up @@ -254,7 256,7 @@ class RealConnection(
}

// We have a host mismatch. But if the certificate matches, we're still good.
return !noCoalescedConnections && handshake != null && certificateSupportHost(url, handshake!!)
return !noCoalescedConnections && handshake != null && certificateSupportHost(url, handshake)
}

private fun certificateSupportHost(
Expand All @@ -272,9 274,9 @@ class RealConnection(
client: OkHttpClient,
chain: RealInterceptorChain,
): ExchangeCodec {
val socket = this.socket!!
val source = this.source!!
val sink = this.sink!!
val socket = this.socket
val source = this.source
val sink = this.sink
val http2Connection = this.http2Connection

return if (http2Connection != null) {
Expand All @@ -289,10 291,6 @@ class RealConnection(

@Throws(SocketException::class)
internal fun newWebSocketStreams(exchange: Exchange): RealWebSocket.Streams {
val socket = this.socket!!
val source = this.source!!
val sink = this.sink!!

socket.soTimeout = 0
noNewExchanges()
return object : RealWebSocket.Streams(true, source, sink) {
Expand All @@ -310,20 308,17 @@ class RealConnection(

override fun cancel() {
// Close the raw socket so we don't end up doing synchronous I/O.
rawSocket?.closeQuietly()
rawSocket.closeQuietly()
}

override fun socket(): Socket = socket!!
override fun socket(): Socket = socket

/** Returns true if this connection is ready to host new streams. */
fun isHealthy(doExtensiveChecks: Boolean): Boolean {
lock.assertNotHeld()

val nowNs = System.nanoTime()

val rawSocket = this.rawSocket!!
val socket = this.socket!!
val source = this.source!!
if (rawSocket.isClosed || socket.isClosed || socket.isInputShutdown ||
socket.isOutputShutdown
) {
Expand Down Expand Up @@ -443,7 438,7 @@ class RealConnection(
}
}

override fun protocol(): Protocol = protocol!!
override fun protocol(): Protocol = protocol

override fun toString(): String {
return "Connection{${route.address.url.host}:${route.address.url.port},"
Expand All @@ -468,12 463,38 @@ class RealConnection(
taskRunner = taskRunner,
connectionPool = connectionPool,
route = route,
rawSocket = null,
rawSocket = Socket(),
socket = socket,
handshake = null,
protocol = null,
source = null,
sink = null,
protocol = Protocol.HTTP_2,
source =
object : Source {
override fun close() = Unit

override fun read(
sink: Buffer,
byteCount: Long,
): Long {
throw UnsupportedOperationException()
}

override fun timeout(): Timeout = Timeout.NONE
}.buffer(),
sink =
object : Sink {
override fun close() = Unit

override fun flush() = Unit

override fun timeout(): Timeout = Timeout.NONE

override fun write(
source: Buffer,
byteCount: Long,
) {
throw UnsupportedOperationException()
}
}.buffer(),
pingIntervalMillis = 0,
ConnectionListener.NONE,
)
Expand Down