cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use HEAD request to determine if file should be downloaded, ensure download method is the same regardless of force mode.

Browse source
This commit is contained in:
jhawkesworth@users.noreply.github.com 2016-03-18 08:41:54 +00:00 committed by Matt Clay
parent 71c50aed24
commit 63f8bdf782
1 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -54,7 +54,7 @@ if($skip_certificate_validation){
$force = Get-Attr -obj $params -name "force" "yes" | ConvertTo-Bool $force = Get-Attr -obj $params -name "force" "yes" | ConvertTo-Bool
If ($force -or -not (Test-Path $dest)) { Function Download-File($result, $url, $dest, $username, $password, $proxy_url, $proxy_username, $proxy_password) {
$webClient = New-Object System.Net.WebClient $webClient = New-Object System.Net.WebClient
if($proxy_url) { if($proxy_url) {
$proxy_server = New-Object System.Net.WebProxy($proxy_url, $true) $proxy_server = New-Object System.Net.WebProxy($proxy_url, $true)
@ -76,8 +76,18 @@ If ($force -or -not (Test-Path $dest)) {
Catch { Catch {
Fail-Json $result "Error downloading $url to $dest $($_.Exception.Message)" Fail-Json $result "Error downloading $url to $dest $($_.Exception.Message)"
} }
}
If ($force -or -not (Test-Path $dest)) {
Download-File -result $result -url $url -dest $dest -username $username -password $password -proxy_url $proxy_url -proxy_username $proxy_username -proxy_password $proxy_password
} }
Else { Else {
$fileLastMod = ([System.IO.FileInfo]$dest).LastWriteTimeUtc
$webLastMod = $null
Try { Try {
$webRequest = [System.Net.HttpWebRequest]::Create($url) $webRequest = [System.Net.HttpWebRequest]::Create($url)
@ -85,24 +95,22 @@ Else {
$webRequest.Credentials = New-Object System.Net.NetworkCredential($username, $password) $webRequest.Credentials = New-Object System.Net.NetworkCredential($username, $password)
} }
$webRequest.IfModifiedSince = ([System.IO.FileInfo]$dest).LastWriteTime $webRequest.Method = "HEAD"
$webRequest.Method = "GET"
[System.Net.HttpWebResponse]$webResponse = $webRequest.GetResponse() [System.Net.HttpWebResponse]$webResponse = $webRequest.GetResponse()
$stream = New-Object System.IO.StreamReader($webResponse.GetResponseStream()) $webLastMod = $webResponse.GetResponseHeader("Last-Modified")
$webResponse.Close()
$stream.ReadToEnd() | Set-Content -Path $dest -Force -ErrorAction Stop
$result.changed = $true
}
Catch [System.Net.WebException] {
If ($_.Exception.Response.StatusCode -ne [System.Net.HttpStatusCode]::NotModified) {
Fail-Json $result "Error downloading $url to $dest $($_.Exception.Message)"
}
} }
Catch { Catch {
Fail-Json $result "Error downloading $url to $dest $($_.Exception.Message)" Fail-Json $result "Error when requesting Last-Modified date from $url $($_.Exception.Message)"
} }
If ((Get-Date -Date $webLastMod ) -lt $fileLastMod) {
$result.changed = $false
} Else {
Download-File -result $result -url $url -dest $dest -username $username -password $password -proxy_url $proxy_url -proxy_username $proxy_username -proxy_password $proxy_password
}
} }
Set-Attr $result.win_get_url "url" $url Set-Attr $result.win_get_url "url" $url