Skip to content

Fix using xml -Body in webcmdlets without an encoding #19281

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

Merged
iSazonov merged 7 commits into from
Mar 7, 2023
Merged

Fix using xml -Body in webcmdlets without an encoding #19281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c0d5bcd
fix bug
CarloToso Mar 5, 2023
b96dd46
add test
CarloToso Mar 6, 2023
a2506dd
fix tests
CarloToso Mar 6, 2023
ebdbdb1
fix tests
CarloToso Mar 6, 2023
cbdc92f
add ()
CarloToso Mar 6, 2023
3370f1f
Update test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlet…
CarloToso Mar 6, 2023
9e7bef1
Update test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlet…
CarloToso Mar 6, 2023
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
2 changes: 1 addition & 1 deletion ...owerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1522,7 +1522,7 @@ internal void SetRequestContent(HttpRequestMessage request, XmlNode xmlNode)

byte[] bytes = null;
XmlDocument doc = xmlNode as XmlDocument;
if (doc?.FirstChild is XmlDeclaration decl)
if (doc?.FirstChild is XmlDeclaration decl && !string.IsNullOrEmpty(decl.Encoding))
{
Encoding encoding = Encoding.GetEncoding(decl.Encoding);
bytes = StreamHelper.EncodeToBytes(doc.OuterXml, encoding);
Expand Down
17 changes: 17 additions & 0 deletions test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,6 +581,15 @@ Describe "Invoke-WebRequest tests" -Tags "Feature", "RequireAdminOnWindows" {
$object.Data | Should -BeExactly 'проверка'
}

It "Invoke-WebRequest supports sending XML requests without encoding" {
$uri = Get-WebListenerUrl -Test POST
$body = '<?xml version="1.0"?><foo />'
$result = Invoke-WebRequest -Uri $uri -body ([xml]$body) -ContentType 'text/xml' -method 'POST'

$object = $result.Content | ConvertFrom-Json
$object.Data | Should -BeExactly $body
}

It "Invoke-WebRequest supports request that returns page containing CodPage 936 data." {
$uri = Get-WebListenerUrl -Test 'Encoding' -TestValue 'CP936'
$command = "Invoke-WebRequest -Uri '$uri'"
Expand Down Expand Up @@ -2347,6 +2356,14 @@ Describe "Invoke-RestMethod tests" -Tags "Feature", "RequireAdminOnWindows" {
$Result.Output.Data | Should -BeExactly 'проверка'
}

It "Invoke-RestMethod supports sending XML requests without encoding" {
$uri = Get-WebListenerUrl -Test POST
$body = '<?xml version="1.0"?><foo />'
$result = Invoke-RestMethod -Uri $uri -body ([xml]$body) -ContentType 'text/xml' -method 'POST'

$result.Data | Should -BeExactly $body
}

It "Invoke-RestMethod supports request that returns page containing Code Page 936 data." {
$uri = Get-WebListenerUrl -Test 'Encoding' -TestValue 'CP936'
$command = "Invoke-RestMethod -Uri '$uri'"
Expand Down