close socket connection when websocket connect failed to avoid potent…

…ial leak (#14038) * close socket connection when websocket connect failed to avoid potential leak * add changelog * fix changelog
Kong · Dec 23, 2024 · dc1a42d · dc1a42d · github-actions · Dec 23, 2024
1 parent 51cb5f1
commit dc1a42d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/changelog/unreleased/kong/fix-potential-socket-connection-leak.yml b/changelog/unreleased/kong/fix-potential-socket-connection-leak.yml
@@ -0,0 +1,3 @@
+message: "Fix potential socket connection leak when websocket client connection fails"
+type: bugfix
+scope: Core
diff --git a/kong/clustering/rpc/manager.lua b/kong/clustering/rpc/manager.lua
@@ -569,6 +569,7 @@ function _M:connect(premature, node_id, host, path, cert, key)
   ::err::
 
   if not exiting() then
+    c:close()
     self:try_connect(reconnection_delay)
   end
 end

diff --git a/kong/clustering/utils.lua b/kong/clustering/utils.lua
@@ -106,6 +106,7 @@ function _M.connect_cp(dp, endpoint, protocols)
 
   local ok, err = c:connect(uri, opts)
   if not ok then
+    c:close()
     return nil, uri, err
   end
-Original file line number
+Diff line change
@@ Expand Up @@
       ::err::
       if not exiting() then
+        c:close()
         self:try_connect(reconnection_delay)
       end
     end
@@ Expand Down @@