communicators/ssh: only try auth methods that are valid
This commit is contained in:
parent
839a2e6fa6
commit
dd69de1073
|
@ -322,9 +322,15 @@ module VagrantPlugins
|
||||||
# Default some options
|
# Default some options
|
||||||
opts[:retries] = 5 if !opts.key?(:retries)
|
opts[:retries] = 5 if !opts.key?(:retries)
|
||||||
|
|
||||||
|
# Set some valid auth methods. We disable the auth methods that
|
||||||
|
# we're not using if we don't have the right auth info.
|
||||||
|
auth_methods = ["none", "hostbased"]
|
||||||
|
auth_methods << "publickey" if ssh_info[:private_key_path]
|
||||||
|
auth_methods << "password" if ssh_info[:password]
|
||||||
|
|
||||||
# Build the options we'll use to initiate the connection via Net::SSH
|
# Build the options we'll use to initiate the connection via Net::SSH
|
||||||
common_connect_opts = {
|
common_connect_opts = {
|
||||||
auth_methods: ["none", "publickey", "hostbased", "password"],
|
auth_methods: auth_methods,
|
||||||
config: false,
|
config: false,
|
||||||
forward_agent: ssh_info[:forward_agent],
|
forward_agent: ssh_info[:forward_agent],
|
||||||
keys: ssh_info[:private_key_path],
|
keys: ssh_info[:private_key_path],
|
||||||
|
|
Loading…
Reference in New Issue