Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2024-12-22 16:48:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: allow 60 second timeouts for ssh inputs

Browse Source 
With the previous change, it is now possible to extend the timeout for
manual inputs. 60 seconds should be a reasonable starting point.
This commit is contained in:
Sylvia Crowe 2024-02-13 17:57:23 -08:00
parent 0eab1e3973
commit a356df3396
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wavesrv/pkg/remote/sshclient.go
View File

@ -109,7 +109,7 @@ func createPublicKeyCallback(sshKeywords *SshKeywords, passphrase string) func()
QueryText: fmt.Sprintf("Enter passphrase for the SSH key: %s", identityFile), QueryText: fmt.Sprintf("Enter passphrase for the SSH key: %s", identityFile),
Title: "Publickey Auth + Passphrase", Title: "Publickey Auth + Passphrase",
} }
ctx, cancelFn := context.WithTimeout(context.Background(), 15*time.Second) ctx, cancelFn := context.WithTimeout(context.Background(), 60*time.Second)
defer cancelFn() defer cancelFn()
response, err := sstore.MainBus.GetUserInput(ctx, request) response, err := sstore.MainBus.GetUserInput(ctx, request)
if err != nil { if err != nil {
@ -139,7 +139,7 @@ func createInteractivePasswordCallbackPrompt() func() (secret string, err error)
return func() (secret string, err error) { return func() (secret string, err error) {
// limited to 15 seconds for some reason. this should be investigated more // limited to 15 seconds for some reason. this should be investigated more
// in the future // in the future
ctx, cancelFn := context.WithTimeout(context.Background(), 15*time.Second) ctx, cancelFn := context.WithTimeout(context.Background(), 60*time.Second)
defer cancelFn() defer cancelFn()
request := &sstore.UserInputRequestType{ request := &sstore.UserInputRequestType{
ResponseType: "text", ResponseType: "text",
@ -199,7 +199,7 @@ func createInteractiveKbdInteractiveChallenge() func(name, instruction string, q
func promptChallengeQuestion(question string, echo bool) (answer string, err error) { func promptChallengeQuestion(question string, echo bool) (answer string, err error) {
// limited to 15 seconds for some reason. this should be investigated more // limited to 15 seconds for some reason. this should be investigated more
// in the future // in the future
ctx, cancelFn := context.WithTimeout(context.Background(), 15*time.Second) ctx, cancelFn := context.WithTimeout(context.Background(), 60*time.Second)
defer cancelFn() defer cancelFn()
request := &sstore.UserInputRequestType{ request := &sstore.UserInputRequestType{
ResponseType: "text", ResponseType: "text",