Merge pull request #526 from nulogy/quote_file_paths_for_ssh

Quote file paths for ssh
matschaffer · Jan 3, 2018 · b873da3 · b873da3
2 parents ba6f1c9 + b01d9f8
commit b873da3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/lib/knife-solo/ssh_command.rb b/lib/knife-solo/ssh_command.rb
@@ -206,11 +206,11 @@ def ssh_args
 
  args << [user, host].compact.join('@')
 
- args << "-F #{config[:ssh_config]}" if config[:ssh_config]
- args << "-i #{identity_file}" if identity_file
+ args << "-F \"#{config[:ssh_config]}\"" if config[:ssh_config]
+ args << "-i \"#{identity_file}\"" if identity_file
  args << "-o ForwardAgent=yes" if config[:forward_agent]
  args << "-p #{config[:ssh_port]}" if config[:ssh_port]
- args << "-o UserKnownHostsFile=#{connection_options[:user_known_hosts_file]}" if config[:host_key_verify] == false
+ args << "-o UserKnownHostsFile=\"#{connection_options[:user_known_hosts_file]}\"" if config[:host_key_verify] == false
  args << "-o StrictHostKeyChecking=no" if config[:host_key_verify] == false
  args << "-o ControlMaster=auto -o ControlPath=#{ssh_control_path} -o ControlPersist=3600" unless config[:ssh_control_master] == "no"
 

diff --git a/test/ssh_command_test.rb b/test/ssh_command_test.rb
@@ -134,23 +134,23 @@ def test_builds_cli_ssh_args
 
  cmd = command("[email protected]", "--ssh-config-file=myconfig")
  cmd.validate_ssh_options!
- assert_equal "[email protected] -F myconfig", cmd.ssh_args
+ assert_equal "[email protected] -F \"myconfig\"", cmd.ssh_args
 
  cmd = command("[email protected]", "--ssh-identity=my_rsa")
  cmd.validate_ssh_options!
- assert_equal "[email protected] -i my_rsa", cmd.ssh_args
+ assert_equal "[email protected] -i \"my_rsa\"", cmd.ssh_args
 
  cmd = command("[email protected]", "--identity-file=my_rsa")
  cmd.validate_ssh_options!
- assert_equal "[email protected] -i my_rsa", cmd.ssh_args
+ assert_equal "[email protected] -i \"my_rsa\"", cmd.ssh_args
 
  cmd = command("[email protected]", "--ssh-port=222")
  cmd.validate_ssh_options!
  assert_equal "[email protected] -p 222", cmd.ssh_args
 
  cmd = command("[email protected]", "--no-host-key-verify")
  cmd.validate_ssh_options!
- assert_equal "[email protected] -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no", cmd.ssh_args
+ assert_equal "[email protected] -o UserKnownHostsFile=\"/dev/null\" -o StrictHostKeyChecking=no", cmd.ssh_args
 
  cmd = command("[email protected]", "--forward-agent")
  cmd.validate_ssh_options!