public_git/orchard
1
0
Fork 0
mirror of https://github.com/cirruslabs/orchard.git synced 2026-10-21 02:22:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix websocket.(*Conn).timeoutLoop goroutine leak (#329)

Browse Source
This commit is contained in:
Nikolay Edigaryev
2025-07-11 15:23:50 +04:00
committed by GitHub
parent 49d63513b2
commit ed7921ce16
5 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/controller/api_rpc_portforward.go
+7
View File
@@ -27,6 +27,13 @@ func (controller *Controller) rpcPortForward(ctx *gin.Context) responder.Respond
if err != nil {
return responder.Error(err)
}
defer func() {
// Ensure that we always close the accepted WebSocket connection,
// otherwise resource leak is possible[1]
//
// [1]: https://github.com/coder/websocket/issues/445#issuecomment-2053792044
_ = wsConn.CloseNow()
}()
// Respond with the established connection
proxyCtx, err := controller.connRendezvous.Respond(session, rendezvous.ResultWithErrorMessage[net.Conn]{
internal/controller/api_rpc_watch.go
+7
View File
@@ -37,6 +37,13 @@ func (controller *Controller) rpcWatch(ctx *gin.Context) responder.Responder {
if err != nil {
return responder.Error(err)
}
defer func() {
// Ensure that we always close the accepted WebSocket connection,
// otherwise resource leak is possible[1]
//
// [1]: https://github.com/coder/websocket/issues/445#issuecomment-2053792044
_ = wsConn.CloseNow()
}()
// Ensure that pongs will be processed by reading
// from the connection in the background
internal/controller/api_vms_portforward.go
+7
View File
@@ -102,6 +102,13 @@ func (controller *Controller) portForward(
if err != nil {
return responder.Error(err)
}
defer func() {
// Ensure that we always close the accepted WebSocket connection,
// otherwise resource leak is possible[1]
//
// [1]: https://github.com/coder/websocket/issues/445#issuecomment-2053792044
_ = wsConn.CloseNow()
}()
expectedMsgType := websocket.MessageBinary