Fix: ssh connector closes failed connections

cyberark · Dec 16, 2021 · 89c30f4 · 89c30f4
1 parent b740617
commit 89c30f4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/internal/plugin/connectors/ssh/proxy_service.go b/internal/plugin/connectors/ssh/proxy_service.go
@@ -130,6 +130,7 @@ func (proxy *proxyService) Start() error {
 			// https://godoc.org/golang.org/x/crypto/ssh#NewServerConn
 			conn, chans, reqs, err := ssh.NewServerConn(nConn, serverConfig)
 			if err != nil {
+				nConn.Close()
 				logger.Debugf("Failed to handshake: %s", err)
 				continue
 			}
@@ -149,6 +150,7 @@ func (proxy *proxyService) Start() error {
 			go func() {
 				if err := proxy.handleConnections(chans); err != nil {
 					logger.Errorf("Failed on handle connection: %s", err)
+					nConn.Close()
 					return
 				}
 

diff --git a/internal/plugin/connectors/ssh/service_connector.go b/internal/plugin/connectors/ssh/service_connector.go
@@ -98,6 +98,11 @@ func (h *ServiceConnector) Connect(
 	}
 
 	if server, err = ssh.Dial(serverConfig.Network, serverConfig.Address, &serverConfig.ClientConfig); err != nil {
+		for newChannel := range h.channels {
+			if err := newChannel.Reject(ssh.ConnectionFailed, "secretless unable to dial upstream"); err != nil {
+				h.logger.Errorf("Failed to send new channel rejection : %s", err)
+			}
+		}
 		return fmt.Errorf("failed to dial SSH backend '%s': %s", serverConfig.Address, err)
 	}