beckermj/vaguerent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13194 from chrisroberts/ssh-comm-interactive

Browse Source 
Remove keyboard-interactive authentication method
This commit is contained in:
Chris Roberts 2023-06-02 17:14:23 -07:00 committed by GitHub
commit 33bc24d9d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/communicators/ssh/communicator.rb
View File

@ -404,7 +404,7 @@ module VagrantPlugins
# Set some valid auth methods. We disable the auth methods that # Set some valid auth methods. We disable the auth methods that
# we're not using if we don't have the right auth info. # we're not using if we don't have the right auth info.
auth_methods = ["none", "hostbased", "keyboard-interactive"] auth_methods = ["none", "hostbased"]
auth_methods << "publickey" if ssh_info[:private_key_path] auth_methods << "publickey" if ssh_info[:private_key_path]
auth_methods << "password" if ssh_info[:password] auth_methods << "password" if ssh_info[:password]
@ -461,10 +461,6 @@ module VagrantPlugins
connect_opts[:keepalive_interval] = 5 connect_opts[:keepalive_interval] = 5
end end
if ssh_info[:password]
connect_opts[:non_interactive] = true
end
@logger.info("Attempting to connect to SSH...") @logger.info("Attempting to connect to SSH...")
@logger.info(" - Host: #{ssh_info[:host]}") @logger.info(" - Host: #{ssh_info[:host]}")
@logger.info(" - Port: #{ssh_info[:port]}") @logger.info(" - Port: #{ssh_info[:port]}")

10
test/unit/plugins/communicators/ssh/communicator_test.rb
View File

@ -664,7 +664,7 @@ describe VagrantPlugins::CommunicatorSSH::Communicator do
it "includes `none` and `hostbased` auth methods" do it "includes `none` and `hostbased` auth methods" do
expect(Net::SSH).to receive(:start).with( expect(Net::SSH).to receive(:start).with(
nil, nil, hash_including( nil, nil, hash_including(
auth_methods: ["none", "hostbased", "keyboard-interactive"] auth_methods: ["none", "hostbased"]
) )
).and_return(true) ).and_return(true)
communicator.send(:connect) communicator.send(:connect)
@ -780,7 +780,7 @@ describe VagrantPlugins::CommunicatorSSH::Communicator do
it "includes `publickey` auth method" do it "includes `publickey` auth method" do
expect(Net::SSH).to receive(:start).with( expect(Net::SSH).to receive(:start).with(
anything, anything, hash_including( anything, anything, hash_including(
auth_methods: ["none", "hostbased", "keyboard-interactive", "publickey"] auth_methods: ["none", "hostbased", "publickey"]
) )
).and_return(true) ).and_return(true)
communicator.send(:connect) communicator.send(:connect)
@ -809,7 +809,7 @@ describe VagrantPlugins::CommunicatorSSH::Communicator do
it "has password defined" do it "has password defined" do
expect(Net::SSH).to receive(:start).with( expect(Net::SSH).to receive(:start).with(
anything, anything, hash_including( anything, anything, hash_including(
password: 'vagrant', non_interactive: true password: 'vagrant'
) )
).and_return(true) ).and_return(true)
communicator.send(:connect) communicator.send(:connect)
@ -818,7 +818,7 @@ describe VagrantPlugins::CommunicatorSSH::Communicator do
it "includes `password` auth method" do it "includes `password` auth method" do
expect(Net::SSH).to receive(:start).with( expect(Net::SSH).to receive(:start).with(
anything, anything, hash_including( anything, anything, hash_including(
auth_methods: ["none", "hostbased", "keyboard-interactive", "password"] auth_methods: ["none", "hostbased", "password"]
) )
).and_return(true) ).and_return(true)
communicator.send(:connect) communicator.send(:connect)
@ -860,7 +860,7 @@ describe VagrantPlugins::CommunicatorSSH::Communicator do
it "includes `publickey` and `password` auth methods" do it "includes `publickey` and `password` auth methods" do
expect(Net::SSH).to receive(:start).with( expect(Net::SSH).to receive(:start).with(
anything, anything, hash_including( anything, anything, hash_including(
auth_methods: ["none", "hostbased", "keyboard-interactive", "publickey", "password"] auth_methods: ["none", "hostbased", "publickey", "password"]
) )
).and_return(true) ).and_return(true)
communicator.send(:connect) communicator.send(:connect)

8
test/unit/plugins/communicators/winssh/communicator_test.rb
View File

@ -328,7 +328,7 @@ describe VagrantPlugins::CommunicatorWinSSH::Communicator do
it "includes `none` and `hostbased` auth methods" do it "includes `none` and `hostbased` auth methods" do
expect(Net::SSH).to receive(:start).with( expect(Net::SSH).to receive(:start).with(
nil, nil, hash_including( nil, nil, hash_including(
auth_methods: ["none", "hostbased", "keyboard-interactive"] auth_methods: ["none", "hostbased"]
) )
).and_return(connection) ).and_return(connection)
communicator.send(:connect) communicator.send(:connect)
@ -420,7 +420,7 @@ describe VagrantPlugins::CommunicatorWinSSH::Communicator do
it "includes `publickey` auth method" do it "includes `publickey` auth method" do
expect(Net::SSH).to receive(:start).with( expect(Net::SSH).to receive(:start).with(
anything, anything, hash_including( anything, anything, hash_including(
auth_methods: ["none", "hostbased", "keyboard-interactive", "publickey"] auth_methods: ["none", "hostbased", "publickey"]
) )
).and_return(connection) ).and_return(connection)
communicator.send(:connect) communicator.send(:connect)
@ -458,7 +458,7 @@ describe VagrantPlugins::CommunicatorWinSSH::Communicator do
it "includes `password` auth method" do it "includes `password` auth method" do
expect(Net::SSH).to receive(:start).with( expect(Net::SSH).to receive(:start).with(
anything, anything, hash_including( anything, anything, hash_including(
auth_methods: ["none", "hostbased", "keyboard-interactive", "password"] auth_methods: ["none", "hostbased", "password"]
) )
).and_return(connection) ).and_return(connection)
communicator.send(:connect) communicator.send(:connect)
@ -500,7 +500,7 @@ describe VagrantPlugins::CommunicatorWinSSH::Communicator do
it "includes `publickey` and `password` auth methods" do it "includes `publickey` and `password` auth methods" do
expect(Net::SSH).to receive(:start).with( expect(Net::SSH).to receive(:start).with(
anything, anything, hash_including( anything, anything, hash_including(
auth_methods: ["none", "hostbased", "keyboard-interactive", "publickey", "password"] auth_methods: ["none", "hostbased", "publickey", "password"]
) )
).and_return(connection) ).and_return(connection)
communicator.send(:connect) communicator.send(:connect)