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

fix: allow automatic and interactive auth together

Browse Source 
Previously, it was impossible to use to separate methods of the same
type to try ssh authentication. This made it impossible to make an auto
attempt before a manual one. This change restricts that by combining
them into one method where the auto attempt is tried once first and
cannot be tried again. Following that, interactive authentication can be
tried separately.

It also lowers the time limit on kbd interactive authentication to 15
seconds due to limitations on the library we are using.
This commit is contained in:
Sylvia Crowe 2024-02-07 16:00:39 -08:00
parent 8dc3b3b0c1
commit 771046637d
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
// Copyright 2024, Command Line Inc. // Copyright 2023-2024, Command Line Inc.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package remote package remote
@ -15,6 +15,7 @@ import (
"path/filepath" "path/filepath"
"strconv" "strconv"
"strings" "strings"
"sync"
"time" "time"
"github.com/kevinburke/ssh_config" "github.com/kevinburke/ssh_config"
@ -80,15 +81,15 @@ func createInteractivePasswordCallbackPrompt() func() (secret string, err error)
} }
} }
func createPasswordCallbackPrompt(password string) func() (secret string, err error) { func createCombinedPasswordCallbackPrompt(password string) func() (secret string, err error) {
var once sync.Once
return func() (secret string, err error) { return func() (secret string, err error) {
defaultPrompt := createDefaultPasswordCallbackPrompt(password) var prompt func() (secret string, err error)
secret, err = defaultPrompt() once.Do(func() { prompt = createDefaultPasswordCallbackPrompt(password) })
if err == nil { if prompt == nil {
return secret, nil prompt = createInteractivePasswordCallbackPrompt()
} }
interactivePrompt := createInteractivePasswordCallbackPrompt() return prompt()
return interactivePrompt()
} }
} }
@ -123,7 +124,9 @@ 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) {
ctx, cancelFn := context.WithTimeout(context.Background(), 60*time.Second) // limited to 15 seconds for some reason. this should be investigated more
// in the future
ctx, cancelFn := context.WithTimeout(context.Background(), 15*time.Second)
defer cancelFn() defer cancelFn()
request := &sstore.UserInputRequestType{ request := &sstore.UserInputRequestType{
ResponseType: "text", ResponseType: "text",
@ -137,9 +140,16 @@ func promptChallengeQuestion(question string, echo bool) (answer string, err err
return response.Text, nil return response.Text, nil
} }
func createKeyboardInteractiveAuth(password string) ssh.AuthMethod { func createCombinedKbdInteractiveChallenge(password string) ssh.KeyboardInteractiveChallenge {
challenge := createInteractiveKbdInteractiveChallenge() var once sync.Once
return ssh.KeyboardInteractive(challenge) return func(name, instruction string, questions []string, echos []bool) (answers []string, err error) {
var challenge ssh.KeyboardInteractiveChallenge
once.Do(func() { challenge = createNaiveKbdInteractiveChallenge(password) })
if challenge == nil {
challenge = createInteractiveKbdInteractiveChallenge()
}
return challenge(name, instruction, questions, echos)
}
} }
func openKnownHostsForEdit(knownHostsFilename string) (*os.File, error) { func openKnownHostsForEdit(knownHostsFilename string) (*os.File, error) {
@ -400,8 +410,8 @@ func ConnectToClient(opts *sstore.SSHOpts) (*ssh.Client, error) {
if err == nil { if err == nil {
authMethods = append(authMethods, publicKeyAuth) authMethods = append(authMethods, publicKeyAuth)
} }
authMethods = append(authMethods, createKeyboardInteractiveAuth(opts.SSHPassword)) authMethods = append(authMethods, ssh.RetryableAuthMethod(ssh.KeyboardInteractive(createCombinedKbdInteractiveChallenge(opts.SSHPassword)), 2))
authMethods = append(authMethods, ssh.PasswordCallback(createInteractivePasswordCallbackPrompt())) authMethods = append(authMethods, ssh.RetryableAuthMethod(ssh.PasswordCallback(createCombinedPasswordCallbackPrompt(opts.SSHPassword)), 2))
configUser, _ := ssh_config.GetStrict(opts.SSHHost, "User") configUser, _ := ssh_config.GetStrict(opts.SSHHost, "User")
configHostName, _ := ssh_config.GetStrict(opts.SSHHost, "HostName") configHostName, _ := ssh_config.GetStrict(opts.SSHHost, "HostName")