win_psexec - support paths with a space (#54009)

This commit is contained in:
Jordan Borean 2019-03-19 12:51:30 +10:00 committed by GitHub
parent 35f8dbed35
commit 7ab77f6c8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 45 additions and 33 deletions

View file

@ -0,0 +1,2 @@
bugfixes:
- win_psexec - Support executables with a space in the path

View file

@ -57,79 +57,79 @@ If (-Not (Get-Command $executable -ErrorAction SilentlyContinue)) {
$module.FailJson("Executable '$executable' was not found.") $module.FailJson("Executable '$executable' was not found.")
} }
$arguments = @() $arguments = [System.Collections.Generic.List`1[String]]@($executable)
If ($nobanner -eq $true) { If ($nobanner -eq $true) {
$arguments += "-nobanner" $arguments.Add("-nobanner")
} }
# Support running on local system if no hostname is specified # Support running on local system if no hostname is specified
If ($hostnames) { If ($hostnames) {
$hostname_argument = ($hostnames | sort -Unique) -join ',' $hostname_argument = ($hostnames | sort -Unique) -join ','
$arguments += "\\$hostname_argument" $arguments.Add("\\$hostname_argument")
} }
# Username is optional # Username is optional
If ($username -ne $null) { If ($null -ne $username) {
$arguments += "-u" $arguments.Add("-u")
$arguments += $username $arguments.Add($username)
} }
# Password is optional # Password is optional
If ($password -ne $null) { If ($null -ne $password) {
$arguments += "-p" $arguments.Add("-p")
$arguments += $password $arguments.Add($password)
} }
If ($chdir -ne $null) { If ($null -ne $chdir) {
$arguments += "-w" $arguments.Add("-w")
$arguments += $chdir $arguments.Add($chdir)
} }
If ($wait -eq $false) { If ($wait -eq $false) {
$arguments += "-d" $arguments.Add("-d")
} }
If ($noprofile -eq $true) { If ($noprofile -eq $true) {
$arguments += "-e" $arguments.Add("-e")
} }
If ($elevated -eq $true) { If ($elevated -eq $true) {
$arguments += "-h" $arguments.Add("-h")
} }
If ($system -eq $true) { If ($system -eq $true) {
$arguments += "-s" $arguments.Add("-s")
} }
If ($interactive -eq $true) { If ($interactive -eq $true) {
$arguments += "-i" $arguments.Add("-i")
If ($session -ne $null) { If ($null -ne $session) {
$arguments += $session $arguments.Add($session)
} }
} }
If ($limited -eq $true) { If ($limited -eq $true) {
$arguments += "-l" $arguments.Add("-l")
} }
If ($priority -ne $null) { If ($null -ne $priority) {
$arguments += "-$priority" $arguments.Add("-$priority")
} }
If ($timeout -ne $null) { If ($null -ne $timeout) {
$arguments += "-n" $arguments.Add("-n")
$arguments += $timeout $arguments.Add($timeout)
} }
# Add additional advanced options # Add additional advanced options
If ($extra_opts) { If ($extra_opts) {
ForEach ($opt in $extra_opts) { ForEach ($opt in $extra_opts) {
$arguments += $opt $arguments.Add($opt)
} }
} }
$arguments += "-accepteula" $arguments.Add("-accepteula")
$argument_string = Argv-ToString -arguments $arguments $argument_string = Argv-ToString -arguments $arguments
@ -138,9 +138,9 @@ $argument_string = Argv-ToString -arguments $arguments
$argument_string += " $command" $argument_string += " $command"
$start_datetime = [DateTime]::UtcNow $start_datetime = [DateTime]::UtcNow
$module.Result.psexec_command = "$executable $argument_string" $module.Result.psexec_command = $argument_string
$command_result = Run-Command -command "$executable $argument_string" $command_result = Run-Command -command $argument_string
$end_datetime = [DateTime]::UtcNow $end_datetime = [DateTime]::UtcNow

View file

@ -1,7 +1,17 @@
# Would use [] but this has troubles with PATH and trying to find the executable so just resort to keeping a space
- name: record special path for tests
set_fact:
testing_dir: '{{ remote_tmp_dir }}\ansible win_psexec'
- name: create special path testing dir
win_file:
path: '{{ testing_dir }}'
state: directory
- name: Download PsExec - name: Download PsExec
win_get_url: win_get_url:
url: https://s3.amazonaws.com/ansible-ci-files/test/integration/targets/win_psexec/PsExec.exe url: https://s3.amazonaws.com/ansible-ci-files/test/integration/targets/win_psexec/PsExec.exe
dest: '{{ remote_tmp_dir }}\PsExec.exe' dest: '{{ testing_dir }}\PsExec.exe'
- name: Get the existing PATH env var - name: Get the existing PATH env var
win_shell: '$env:PATH' win_shell: '$env:PATH'
@ -14,7 +24,7 @@
nobanner: true nobanner: true
register: whoami register: whoami
environment: environment:
PATH: '{{ remote_tmp_dir }};{{ system_path.stdout | trim }}' PATH: '{{ testing_dir }};{{ system_path.stdout | trim }}'
- name: Test whoami - name: Test whoami
assert: assert:
@ -29,7 +39,7 @@
command: whoami.exe command: whoami.exe
system: yes system: yes
nobanner: true nobanner: true
executable: '{{ remote_tmp_dir }}\PsExec.exe' executable: '{{ testing_dir }}\PsExec.exe'
register: whoami_as_system register: whoami_as_system
# Seems to be a bug with PsExec where the stdout can be empty, just retry the task to make this test a bit more stable # Seems to be a bug with PsExec where the stdout can be empty, just retry the task to make this test a bit more stable
until: whoami_as_system.rc == 0 and whoami_as_system.stdout == 'nt authority\system' until: whoami_as_system.rc == 0 and whoami_as_system.stdout == 'nt authority\system'
@ -61,7 +71,7 @@
ignore_errors: yes ignore_errors: yes
register: whoami_multiple_args register: whoami_multiple_args
environment: environment:
PATH: '{{ remote_tmp_dir }};{{ system_path.stdout | trim }}' PATH: '{{ testing_dir }};{{ system_path.stdout | trim }}'
- name: Test command with multiple argumetns - name: Test command with multiple argumetns
assert: assert: