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

win_get_url: Changed basic auth from NetworkCredential to Base64 (#32389)

Browse source 
* Changed basic auth from NetworkCredential to Base64

* Added force_basic_auth parameter to win_get_url module

force_basic_auth provides user with option to control which mechanism to use

Updated win_get_url.py documentation section

* Add missing version_added in win_get_url.py

* minor update for documentation
This commit is contained in:
Wojciech Pietruszeski 2017-12-18 21:38:44 +01:00 committed by Jordan Borean
parent 370a7ace4b
commit 2a0cb20a1f
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/ansible/modules/windows/win_get_url.ps1
View file

@ -106,7 +106,11 @@ Function Download-File($result, $url, $dest, $headers, $credentials, $timeout, $
} }
if ($credentials) { if ($credentials) {
$extWebClient.Credentials = $credentials if ($force_basic_auth) {
$extWebClient.Headers.Add("Authorization","Basic $credentials")
} else {
$extWebClient.Credentials = $credentials
}
} }
if (-not $whatif) { if (-not $whatif) {
@ -138,6 +142,7 @@ $skip_certificate_validation = Get-AnsibleParam -obj $params -name "skip_certifi
$validate_certs = Get-AnsibleParam -obj $params -name "validate_certs" -type "bool" -default $true $validate_certs = Get-AnsibleParam -obj $params -name "validate_certs" -type "bool" -default $true
$url_username = Get-AnsibleParam -obj $params -name "url_username" -type "str" -aliases "username" $url_username = Get-AnsibleParam -obj $params -name "url_username" -type "str" -aliases "username"
$url_password = Get-AnsibleParam -obj $params -name "url_password" -type "str" -aliases "password" $url_password = Get-AnsibleParam -obj $params -name "url_password" -type "str" -aliases "password"
$force_basic_auth = Get-AnsibleParam -obj $params -name "force_basic_auth" -type "bool" -default $false
$use_proxy = Get-AnsibleParam -obj $params -name "use_proxy" -type "bool" -default $true $use_proxy = Get-AnsibleParam -obj $params -name "use_proxy" -type "bool" -default $true
$proxy_url = Get-AnsibleParam -obj $params -name "proxy_url" -type "str" $proxy_url = Get-AnsibleParam -obj $params -name "proxy_url" -type "str"
$proxy_username = Get-AnsibleParam -obj $params -name "proxy_username" -type "str" $proxy_username = Get-AnsibleParam -obj $params -name "proxy_username" -type "str"
@ -170,7 +175,12 @@ if ($proxy_url) {
$credentials = $null $credentials = $null
if ($url_username -and $url_password) { if ($url_username -and $url_password) {
$credentials = New-Object System.Net.NetworkCredential($url_username, $url_password) if ($force_basic_auth) {
$credentials = [convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes($url_username+":"+$url_password))
} else {
$credentials = New-Object System.Net.NetworkCredential($url_username, $url_password)
}
} }
# If skip_certificate_validation was specified, use validate_certs # If skip_certificate_validation was specified, use validate_certs

7
lib/ansible/modules/windows/win_get_url.py
View file

@ -69,6 +69,13 @@ options:
description: description:
- Basic authentication password. - Basic authentication password.
aliases: [ password ] aliases: [ password ]
force_basic_auth:
description:
- If C(yes), will add a Basic authentication header on the initial request.
- If C(no), will use Microsoft's WebClient to handle authentication.
type: bool
default: 'no'
version_added: "2.5"
skip_certificate_validation: skip_certificate_validation:
description: description:
- This option is deprecated since v2.4, please use C(validate_certs) instead. - This option is deprecated since v2.4, please use C(validate_certs) instead.