fix(api): gateway

This commit is contained in:
ttk
2024-10-10 16:09:56 +08:00
parent 12419095a9
commit 7e86c4ded4
3 changed files with 15 additions and 13 deletions

View File

@@ -360,18 +360,13 @@ func connectSsh(ctx *gin.Context, sess *gsession.Session, asset *model.Asset, ac
User: account.Account,
Auth: []gossh.AuthMethod{auth},
HostKeyCallback: gossh.InsecureIgnoreHostKey(),
Timeout: time.Second * 3,
Timeout: time.Second,
})
if err != nil {
logger.L().Error("ssh dial failed", zap.Error(err))
return
}
if asset.GatewayId != 0 {
if err = <-ggateway.GetGatewayBySessionId(sess.SessionId).Opened; err != nil {
return
}
}
sshSess, err := sshCli.NewSession()
if err != nil {
logger.L().Error("ssh session create failed", zap.Error(err))
@@ -465,6 +460,8 @@ func connectGuacd(ctx *gin.Context, sess *gsession.Session, asset *model.Asset,
logger.L().Error("guacd tunnel failed", zap.Error(err))
return
}
defer t.Close()
sess.ConnectionId = t.ConnectionId
sess.GuacdTunnel = t