ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

powershell.ps1: Validate Windows paths (#26488)

Browse source 
During the writing of Windows path integration tests we discovered that
incorrect paths (including escape sequences) cause very cryptic error
messages.

This fix ensures that invalid paths cause a proper error message.

We also had to fix the following modules:
- win_shortcut: `src` can be a URL
This commit is contained in:
Dag Wieers 2017-07-10 19:45:16 +02:00 committed by Matt Davis
parent c0fc79647a
commit 05e5698472
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/module_utils/powershell.ps1
View file

@ -205,6 +205,10 @@ Function Get-AnsibleParam($obj, $name, $default = $null, $resultobj = @{}, $fail
if ($type -eq "path") { if ($type -eq "path") {
# Expand environment variables on path-type # Expand environment variables on path-type
$value = Expand-Environment($value) $value = Expand-Environment($value)
# Test if a valid path is provided
if (-not (Test-Path -IsValid $value)) {
Fail-Json -obj $resultobj -message "Get-AnsibleParam: Parameter '$name' has an invalid path '$value' specified."
}
} elseif ($type -eq "str") { } elseif ($type -eq "str") {
# Convert str types to real Powershell strings # Convert str types to real Powershell strings
$value = $value.ToString() $value = $value.ToString()

2
lib/ansible/modules/windows/win_shortcut.ps1
View file

@ -26,7 +26,7 @@ $ErrorActionPreference = "Stop"
$params = Parse-Args $args -supports_check_mode $true $params = Parse-Args $args -supports_check_mode $true
$check_mode = Get-AnsibleParam -obj $params -name "_ansible_check_mode" -type "bool" -default $false $check_mode = Get-AnsibleParam -obj $params -name "_ansible_check_mode" -type "bool" -default $false
$src = Get-AnsibleParam -obj $params -name "src" -type "path" $src = Get-AnsibleParam -obj $params -name "src"
$dest = Get-AnsibleParam -obj $params -name "dest" -type "path" -failifempty $true $dest = Get-AnsibleParam -obj $params -name "dest" -type "path" -failifempty $true
$state = Get-AnsibleParam -obj $params -name "state" -type "string" -default "present" -validateset "present","absent" $state = Get-AnsibleParam -obj $params -name "state" -type "string" -default "present" -validateset "present","absent"
$orig_args = Get-AnsibleParam -obj $params -name "args" -type "string" $orig_args = Get-AnsibleParam -obj $params -name "args" -type "string"