fix bug: systemuser

jumpserver · Jul 10, 2019 · 24dd3c4 · 24dd3c4
1 parent 4ba0600
commit 24dd3c4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/srvconn/connmanager.go b/pkg/srvconn/connmanager.go
@@ -201,7 +201,9 @@ func GetClientFromCache(user *model.User, asset *model.Asset, systemUser *model.
 	if !ok {
 		return
 	}
-
+	if systemUser.Username == ""{
+		systemUser.Username = client.Username
+	}
 	var u = user.Username
 	var ip = asset.IP
 	clientsRefCounter[client]++

diff --git a/pkg/srvconn/sshconn.go b/pkg/srvconn/sshconn.go
@@ -78,9 +78,7 @@ func (sc *ServerSSHConnection) TryConnectFromCache(h, w int, term string) (err e
 	if sc.client == nil {
 		return errors.New("no client in cache")
 	}
-	if sc.SystemUser.Username == "" {
-		sc.SystemUser.Username = sc.client.Username
-	}
+
 	err = sc.invokeShell(h, w, term)
 	if err != nil {
 		RecycleClient(sc.client)