Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Invoke-WebRequest behavior changes with PowerShell 7. #58

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix Invoke-WebRequest behavior changes with PowerShell 7. #58

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
52c5c58
Fixed issue where Powershell V7 would not allow insecure redirects.
r0ckf0x Apr 23, 2024
0364da9
minor formatting changes
mdewart-hummingbird Apr 23, 2024
5375ba4
removing trailing whitespaces
mdewart-hummingbird Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 26 additions & 17 deletions ConnectWiseManageAPI/Private/Invoke/Invoke-CWMWebRequest.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,16 @@
if ($Key -eq 'Accept' -and $Arguments.Version -and $Arguments.Version -ne $script:CWMServerConnection.Version) {
$Arguments.Headers.Accept = "application/vnd.connectwise.com+json; version=$($Arguments.Version)"
Write-Verbose "Version Passed: $($Arguments.Version)"
}
else {
} else {
$Arguments.Headers += @{$Key = $script:CWMServerConnection.Headers.$Key }
}
}
}
$Arguments.Remove('Version')

if (!$Arguments.SessionVariable) { $Arguments.WebSession = $script:CWMServerConnection.Session }
if (!$Arguments.SessionVariable) {
$Arguments.WebSession = $script:CWMServerConnection.Session
}

# Check URI format
if ($Arguments.URI -notlike '*`?*' -and $Arguments.URI -like '*`&*') {
Expand All @@ -42,11 +43,14 @@
$prevProgressPreference = $global:ProgressPreference
$global:ProgressPreference = 'SilentlyContinue'

$Result = Invoke-WebRequest @Arguments -UseBasicParsing
if ($psversiontable.psversion.major -ge 7) {
$Result = Invoke-WebRequest @Arguments -UseBasicParsing -AllowInsecureRedirect
} else {
$Result = Invoke-WebRequest @Arguments -UseBasicParsing
}

$global:ProgressPreference = $prevProgressPreference
}
catch {
} catch {
$global:ProgressPreference = $prevProgressPreference

# Start error message
Expand All @@ -59,8 +63,7 @@
$ErrorStream = $_.Exception.Response.GetResponseStream()
$Reader = New-Object System.IO.StreamReader($ErrorStream)
$script:ErrBody = $Reader.ReadToEnd() | ConvertFrom-Json
}
catch {
} catch {
$script:ErrBody = $_.Exception.Response.Content
}
$ErrBody = $script:ErrBody
Expand All @@ -70,8 +73,7 @@
if ($ErrBody.code -eq 'Unauthorized') {
$ErrorMessage += "-----> $($ErrBody.message)"
$ErrorMessage += "-----> Use 'Disconnect-CWM' or 'Connect-CWM -Force' to set new authentication."
}
elseif ($ErrBody.code -eq 'ConnectWiseApi') {
} elseif ($ErrBody.code -eq 'ConnectWiseApi') {
switch ($ErrBody.message) {
'UserNotAuthenticated' {
$ErrorMessage += "-----> $($ErrBody.message)"
Expand All @@ -82,13 +84,11 @@
$ErrorMessage += '-----> ^ Error has not been documented please report. ^'
}
}
}
else {
} else {
$ErrorMessage += "-----> $($ErrBody.message)"
$ErrorMessage += '-----> ^ Error has not been documented please report. ^'
}
}
elseif ($_.Exception.message) {
} elseif ($_.Exception.message) {
$ErrorMessage += 'An exception has been thrown.'
$ErrorMessage += "--> $($_.Exception.message)"
}
Expand All @@ -104,8 +104,11 @@
}
}

if ($ErrorMessage.Length -lt 1) { $ErrorMessage = $_ }
else { $ErrorMessage += $_.ScriptStackTrace }
if ($ErrorMessage.Length -lt 1) {
$ErrorMessage = $_
} else {
$ErrorMessage += $_.ScriptStackTrace
}

return Write-Error ($ErrorMessage | Out-String)
}
Expand All @@ -122,8 +125,14 @@
Write-Warning "Issue with request, status: $($Result.StatusCode) $($Result.StatusDescription)"
Write-Warning "$($Retry)/$($MaxRetry) retries, waiting $($Wait)ms."
Start-Sleep -Milliseconds $Wait
$Result = Invoke-WebRequest @Arguments -UseBasicParsing
if ($psversiontable.psversion.major -ge 7) {
$Result = Invoke-WebRequest @Arguments -UseBasicParsing -AllowInsecureRedirect
} else {
$Result = Invoke-WebRequest @Arguments -UseBasicParsing
}

}

if ($Retry -ge $MaxRetry) {
return Write-Error "Max retries hit. Status: $($Result.StatusCode) $($Result.StatusDescription)"
}
Expand Down