diff --git a/plugins/communicators/winrm/communicator.rb b/plugins/communicators/winrm/communicator.rb index 0b27e73fa..e22a4f9b0 100644 --- a/plugins/communicators/winrm/communicator.rb +++ b/plugins/communicators/winrm/communicator.rb @@ -218,10 +218,10 @@ module VagrantPlugins wrapped_encoded_command = Base64.strict_encode64( "$ProgressPreference='SilentlyContinue'; #{command}; exit $LASTEXITCODE".encode('UTF-16LE', 'UTF-8')) - "powershell -executionpolicy bypass -file \"#{guest_script_path}\" " + - "-username \"#{shell.username}\" -password \"#{shell.password}\" " + - "-encoded_command \"#{wrapped_encoded_command}\" " + - "-execution_time_limit \"#{shell.execution_time_limit}\"" + "powershell -executionpolicy bypass -file '#{guest_script_path}' " + + "-username '#{shell.username}' -password '#{shell.password}' " + + "-encoded_command '#{wrapped_encoded_command}' " + + "-execution_time_limit '#{shell.execution_time_limit}'" end # Handles the raw WinRM shell result and converts it to a diff --git a/test/unit/plugins/communicators/winrm/communicator_test.rb b/test/unit/plugins/communicators/winrm/communicator_test.rb index e65ce15ce..6ce69be9e 100644 --- a/test/unit/plugins/communicators/winrm/communicator_test.rb +++ b/test/unit/plugins/communicators/winrm/communicator_test.rb @@ -89,7 +89,8 @@ describe VagrantPlugins::CommunicatorWinRM::Communicator do expect(shell).to receive(:upload).with(kind_of(String), "c:/tmp/vagrant-elevated-shell.ps1") expect(shell).to receive(:powershell) do |cmd| expect(cmd).to eq("powershell -executionpolicy bypass -file \"c:/tmp/vagrant-elevated-shell.ps1\" " + - "-username \"vagrant\" -password \"password\" -encoded_command \"JABQAHIAbwBnAHIAZQBzAHMAUAByAGUAZgBlAHIAZQBuAGMAZQA9ACcAUwBpAGwAZQBuAHQAbAB5AEMAbwBuAHQAaQBuAHUAZQAnADsAIABkAGkAcgA7ACAAZQB4AGkAdAAgACQATABBAFMAVABFAFgASQBUAEMATwBEAEUA\" -execution_time_limit \"PT2H\"") + "-username 'vagrant' -password 'password' -encoded_command 'JABQAHIAbwBnAHIAZQBzAHMAUAByAGUAZgBlAHIAZQBuAGMAZQA9ACcAUwBpAGwAZQBuAHQAbAB5AEMAbwBuAHQAaQBuAHUAZQAnADsAIABkAGkAcgA7ACAAZQB4AGkAdAAgACQATABBAFMAVABFAFgASQBUAEMATwBEAEUA' -execution_time_limit 'PT2H'") +>>>>>>> cbb03a02d4b42e350ed92f73ced05f3046100ae8 end.and_return({ exitcode: 0 }) expect(subject.execute("dir", { elevated: true })).to eq(0) end