1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-10-07 22:16:16 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Fix SSH SDK timeout and disconnection issues (#9776)

Browse source
This commit is contained in:
ssongliu 2025-07-31 17:22:19 +08:00 • committed by GitHub
parent 50dcb6c7e4
commit 2ce5ad82ce
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
core/utils/ssh/ssh.go
View file

@ -2,6 +2,7 @@ package ssh
import (
"fmt"
"net"
"strings"
"time"
@ -51,7 +52,7 @@ func NewClient(c ConnInfo) (*SSHClient, error) {
if strings.Contains(c.Addr, ":") {
proto = "tcp6"
}
client, err := gossh.Dial(proto, addr, config)
client, err := DialWithTimeout(proto, addr, config)
if nil != err {
return nil, err
}
@ -207,3 +208,20 @@ func (c *SSHClient) RunWithStreamOutput(command string, outputCallback func(stri
return err
}
func DialWithTimeout(network, addr string, config *gossh.ClientConfig) (*gossh.Client, error) {
conn, err := net.DialTimeout(network, addr, config.Timeout)
if err != nil {
return nil, err
}
_ = conn.SetDeadline(time.Now().Add(config.Timeout))
c, chans, reqs, err := gossh.NewClientConn(conn, addr, config)
if err != nil {
return nil, err
}
if err := conn.SetDeadline(time.Time{}); err != nil {
conn.Close()
return nil, fmt.Errorf("clear deadline failed: %v", err)
}
return gossh.NewClient(c, chans, reqs), nil
}