[Update] 修改连接缓存问题

pkg/proxy/proxy.go

@@ -189,7 +189,7 @@ func (p *ProxyServer) preCheckRequisite() (ok bool) {
 
 // sendConnectErrorMsg 发送连接错误消息
 func (p *ProxyServer) sendConnectErrorMsg(err error) {
-	msg := fmt.Sprintf("Connect asset %s error: %s", p.Asset.Hostname, err)
+	msg := fmt.Sprintf("Connect asset %s error: %s\r\n", p.Asset.Hostname, err)
 	utils.IgnoreErrWriteString(p.UserConn, msg)
 	logger.Error(msg)
 	password := p.SystemUser.Password

pkg/srvconn/connmanager.go

 package srvconn
 
 import (
-	"github.com/jumpserver/koko/pkg/service"
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/jumpserver/koko/pkg/service"
 	"net"
 	"strconv"
 	"sync"
@@ -209,21 +209,28 @@ func RecycleClient(client *gossh.Client) {
 	if counter, ok := clientsRefCounter[client]; ok {
 		if counter == 1 {
 			logger.Debug("Recycle client: close it")
-			_ = client.Close()
-			delete(clientsRefCounter, client)
-			var key string
-			for k, v := range sshClients {
-				if v == client {
-					key = k
-					break
-				}
-			}
-			if key != "" {
-				delete(sshClients, key)
-			}
+			CloseClient(client)
 		} else {
 			clientsRefCounter[client]--
 			logger.Debugf("Recycle client: ref -1: %d", clientsRefCounter[client])
 		}
 	}
 }
+
+func CloseClient(client *gossh.Client) {
+	clientLock.Lock()
+	defer clientLock.Unlock()
+
+	delete(clientsRefCounter, client)
+	var key string
+	for k, v := range sshClients {
+		if v == client {
+			key = k
+			break
+		}
+	}
+	if key != "" {
+		delete(sshClients, key)
+	}
+	_ = client.Close()
+}

pkg/srvconn/sshconn.go

@@ -72,10 +72,11 @@ func (sc *ServerSSHConnection) Connect(h, w int, term string) (err error) {
 func (sc *ServerSSHConnection) TryConnectFromCache(h, w int, term string) (err error) {
 	sc.client = GetClientFromCache(sc.User, sc.Asset, sc.SystemUser)
 	if sc.client == nil {
-		return errors.New("No client in cache")
+		return errors.New("no client in cache")
 	}
 	err = sc.invokeShell(h, w, term)
 	if err != nil {
+		CloseClient(sc.client)
 		return
 	}
 	sc.connected = true