haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

core: Fix regression caused by recent changes that allowed multiple private keys [GH-907]

This commit is contained in:
Fabio Rehm 2013-11-29 00:19:16 -02:00
parent 0f4e29d869
commit 9753f988b0
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/vagrant/action/builtin/ssh_exec.rb
View File

@ -29,8 +29,10 @@ module Vagrant
raise Errors::SSHNotReady if info.nil? raise Errors::SSHNotReady if info.nil?
if info[:private_key_path] if info[:private_key_path]
# Check the SSH key permissions # Check SSH key permissions
SSH.check_key_permissions(Pathname.new(info[:private_key_path])) info[:private_key_path].each do |path|
SSH.check_key_permissions(Pathname.new(path))
end
end end
# Exec! # Exec!

9
lib/vagrant/action/builtin/ssh_run.rb
View File

@ -9,6 +9,9 @@ module Vagrant
# mirror the output to the UI. The resulting exit status of the command # mirror the output to the UI. The resulting exit status of the command
# will exist in the `:ssh_run_exit_status` key in the environment. # will exist in the `:ssh_run_exit_status` key in the environment.
class SSHRun class SSHRun
# For quick access to the `SSH` class.
include Vagrant::Util
def initialize(app, env) def initialize(app, env)
@app = app @app = app
@logger = Log4r::Logger.new("vagrant::action::builtin::ssh_run") @logger = Log4r::Logger.new("vagrant::action::builtin::ssh_run")
@ -23,8 +26,10 @@ module Vagrant
raise Errors::SSHNotReady if info.nil? raise Errors::SSHNotReady if info.nil?
if info[:private_key_path] if info[:private_key_path]
# Check the SSH key permissions # Check SSH key permissions
Util::SSH.check_key_permissions(Pathname.new(info[:private_key_path])) info[:private_key_path].each do |path|
SSH.check_key_permissions(Pathname.new(path))
end
end end
# Execute! # Execute!