4e81be879c
With this change, any caller of machine.ssh_info is assured that best efforts will be done to fix possible wrong permissions on the private key files. Fix #4652
45 lines
1.3 KiB
Ruby
45 lines
1.3 KiB
Ruby
require "pathname"
|
|
|
|
require "vagrant/util/ssh"
|
|
|
|
module Vagrant
|
|
module Action
|
|
module Builtin
|
|
# This class will exec into a full fledged SSH console into the
|
|
# remote machine. This middleware assumes that the VM is running and
|
|
# ready for SSH, and uses the {Machine#ssh_info} method to retrieve
|
|
# SSH information necessary to connect.
|
|
#
|
|
# Note: If there are any middleware after `SSHExec`, they will **not**
|
|
# run, since exec replaces the currently running process.
|
|
class SSHExec
|
|
# For quick access to the `SSH` class.
|
|
include Vagrant::Util
|
|
|
|
def initialize(app, env)
|
|
@app = app
|
|
end
|
|
|
|
def call(env)
|
|
# Grab the SSH info from the machine or the environment
|
|
info = env[:ssh_info]
|
|
info ||= env[:machine].ssh_info
|
|
|
|
# If the result is nil, then the machine is telling us that it is
|
|
# not yet ready for SSH, so we raise this exception.
|
|
raise Errors::SSHNotReady if info.nil?
|
|
|
|
info[:private_key_path] ||= []
|
|
|
|
if info[:private_key_path].empty? && info[:password]
|
|
env[:ui].warn(I18n.t("vagrant.ssh_exec_password"))
|
|
end
|
|
|
|
# Exec!
|
|
SSH.exec(info, env[:ssh_opts])
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|