Skip to content

fix: close streams when portforwarding is closed while copying (#23587) #200

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
merged 1 commit into from
Oct 23, 2025
Merged

fix: close streams when portforwarding is closed while copying (#23587) #200

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 25 additions & 12 deletions src/main/kotlin/com/redhat/devtools/gateway/openshift/Pods.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,22 +172,20 @@ class Pods(private val client: ApiClient) {
forwardResult = portForward.forward(pod, listOf(remotePort))
copyStreams(clientSocket, forwardResult, remotePort)
return
} catch (e: IOException) {
} catch (e: Exception) {
if (e is kotlin.coroutines.cancellation.CancellationException) throw e
logger.info(
"Could not port forward $localPort -> $remotePort: ${e.message}. " +
"Retrying in ${RECONNECT_DELAY}ms..."
"Could not port forward $localPort -> $remotePort: ${e.message}. Retrying in ${RECONNECT_DELAY}ms..."
)
if (isActive) {
delay(RECONNECT_DELAY)
}
} finally {
runCatching {
forwardResult?.getInputStream(remotePort)?.close()
forwardResult?.getOutboundStream(remotePort)?.close()
}
closeStreams(remotePort, forwardResult)
}
}
} catch(e: Exception) {
if (e is kotlin.coroutines.cancellation.CancellationException) throw e
logger.warn(
"Could not port forward to pod ${pod.metadata?.name} using port $localPort -> $remotePort",
e)
Expand All @@ -205,20 +203,35 @@ class Pods(private val client: ApiClient) {
coroutineScope {
ensureActive()
launch {
clientSocket.getInputStream().copyToAndHandleExceptions(forwardResult.getOutboundStream(remotePort))
try {
clientSocket.getInputStream().copyToAndFlush(forwardResult.getOutboundStream(remotePort))
} catch (e: Exception) {
closeStreams(remotePort, forwardResult)
throw e
}
}
launch {
forwardResult.getInputStream(remotePort).copyToAndHandleExceptions(clientSocket.getOutputStream())
try {
forwardResult.getInputStream(remotePort).copyToAndFlush(clientSocket.getOutputStream())
} catch (e: Exception) {
closeStreams(remotePort, forwardResult)
throw e
}
}
}
}

private fun InputStream.copyToAndHandleExceptions(destination: OutputStream) {
private fun closeStreams(port: Int, forwardResult: PortForward.PortForwardResult?) {
runCatching { forwardResult?.getInputStream(port)?.close() }
runCatching { forwardResult?.getOutboundStream(port)?.close() }
}

private fun InputStream.copyToAndFlush(destination: OutputStream) {
try {
this.copyTo(destination)
copyTo(destination)
destination.flush()
} catch (e: IOException) {
logger.info("IOException during stream copy: ${e.message}")
logger.info("IOException during stream copy.", e)
throw e
}
}
Expand Down
Loading