Commit 2ce5ad8

authored

fix: Fix SSH SDK timeout and disconnection issues (1Panel-dev#9776)

1 parent 50dcb6c commit 2ce5ad8Copy full SHA for 2ce5ad8

File tree

+19

-1

lines changed

+19

-1

lines changed

Lines changed: 19 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ package ssh`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
	`5`	`+ "net"`
`5`	`6`	`"strings"`
`6`	`7`	`"time"`
`7`	`8`
`@@ -51,7 +52,7 @@ func NewClient(c ConnInfo) (*SSHClient, error) {`
`51`	`52`	`if strings.Contains(c.Addr, ":") {`
`52`	`53`	`proto = "tcp6"`
`53`	`54`	`}`
`54`		`- client, err := gossh.Dial(proto, addr, config)`
	`55`	`+ client, err := DialWithTimeout(proto, addr, config)`
`55`	`56`	`if nil != err {`
`56`	`57`	`return nil, err`
`57`	`58`	`}`
`@@ -207,3 +208,20 @@ func (c *SSHClient) RunWithStreamOutput(command string, outputCallback func(stri`
`207`	`208`
`208`	`209`	`return err`
`209`	`210`	`}`
	`211`	`+`
	`212`	`+func DialWithTimeout(network, addr string, config gossh.ClientConfig) (gossh.Client, error) {`
	`213`	`+ conn, err := net.DialTimeout(network, addr, config.Timeout)`
	`214`	`+ if err != nil {`
	`215`	`+ return nil, err`
	`216`	`+ }`
	`217`	`+ _ = conn.SetDeadline(time.Now().Add(config.Timeout))`
	`218`	`+ c, chans, reqs, err := gossh.NewClientConn(conn, addr, config)`
	`219`	`+ if err != nil {`
	`220`	`+ return nil, err`
	`221`	`+ }`
	`222`	`+ if err := conn.SetDeadline(time.Time{}); err != nil {`
	`223`	`+ conn.Close()`
	`224`	`+ return nil, fmt.Errorf("clear deadline failed: %v", err)`
	`225`	`+ }`
	`226`	`+ return gossh.NewClient(c, chans, reqs), nil`
	`227`	`+}`

Comments

(0)