Skip to content

Take into account ContentType from Headers in WebCmdlets #19227

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 3 commits into from
Mar 1, 2023
Merged

Take into account ContentType from Headers in WebCmdlets #19227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23dd037
check for ContentType in Headers
CarloToso Feb 26, 2023
77d6c79
add 1 test
CarloToso Feb 26, 2023
8eff42c
add Invoke-RestMethod test
CarloToso Feb 28, 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
8 changes: 5 additions & 3 deletions ...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 @@ -1488,14 +1488,16 @@ internal void SetRequestContent(HttpRequestMessage request, string content)
ArgumentNullException.ThrowIfNull(content);

Encoding encoding = null;
if (ContentType is not null)
string contentType = WebSession.ContentHeaders[HttpKnownHeaderNames.ContentType];

if (contentType is not null)
{
// If Content-Type contains the encoding format (as CharSet), use this encoding format
// to encode the Body of the WebRequest sent to the server. Default Encoding format
// would be used if Charset is not supplied in the Content-Type property.
try
{
MediaTypeHeaderValue mediaTypeHeaderValue = MediaTypeHeaderValue.Parse(ContentType);
MediaTypeHeaderValue mediaTypeHeaderValue = MediaTypeHeaderValue.Parse(contentType);
if (!string.IsNullOrEmpty(mediaTypeHeaderValue.CharSet))
{
encoding = Encoding.GetEncoding(mediaTypeHeaderValue.CharSet);
Expand All @@ -1506,7 +1508,7 @@ internal void SetRequestContent(HttpRequestMessage request, string content)
if (!SkipHeaderValidation)
{
ValidationMetadataException outerEx = new(WebCmdletStrings.ContentTypeException, ex);
ErrorRecord er = new(outerEx, "WebCmdletContentTypeException", ErrorCategory.InvalidArgument, ContentType);
ErrorRecord er = new(outerEx, "WebCmdletContentTypeException", ErrorCategory.InvalidArgument, contentType);
ThrowTerminatingError(er);
}
}
Expand Down
16 changes: 15 additions & 1 deletion 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 @@ -568,6 +568,13 @@ Describe "Invoke-WebRequest tests" -Tags "Feature", "RequireAdminOnWindows" {
$Result.Output.Content | Should -Match '⡌⠁⠧⠑ ⠼⠁⠒ ⡍⠜⠇⠑⠹⠰⠎ ⡣⠕⠌'
}

It "Invoke-WebRequest -ContentType overwrites Content-Type from -Headers." {
$uri = Get-WebListenerUrl -Test 'POST'
$command = "Invoke-WebRequest -Uri '$uri' -ContentType 'application/json' -Headers @{'Content-Type'='plain/text'} -Method 'POST'"
$result = ExecuteWebCommand -command $command
$result.Output.BaseResponse.RequestMessage.Content.Headers.ContentType.MediaType | Should -BeExactly 'application/json'
}

It "Invoke-WebRequest supports sending request as UTF-8." {
$uri = Get-WebListenerUrl -Test 'POST'
# Body must contain non-ASCII characters
Expand All @@ -576,7 +583,7 @@ Describe "Invoke-WebRequest tests" -Tags "Feature", "RequireAdminOnWindows" {
$result = ExecuteWebCommand -command $command
ValidateResponse -response $result

$Result.Output.Encoding.BodyName | Should -BeExactly 'utf-8'
$result.Output.Encoding.BodyName | Should -BeExactly 'utf-8'
$object = $Result.Output.Content | ConvertFrom-Json
$object.Data | Should -BeExactly 'проверка'
}
Expand Down Expand Up @@ -2338,6 +2345,13 @@ Describe "Invoke-RestMethod tests" -Tags "Feature", "RequireAdminOnWindows" {
$Result.Output | Should -Match '⡌⠁⠧⠑ ⠼⠁⠒ ⡍⠜⠇⠑⠹⠰⠎ ⡣⠕⠌'
}

It "Invoke-RestMethod -ContentType overwrites Content-Type from -Headers." {
$uri = Get-WebListenerUrl -Test 'POST'
$command = "Invoke-RestMethod -Uri '$uri' -ContentType 'application/json' -Headers @{'Content-Type'='plain/text'} -Method 'POST'"
$result = ExecuteWebCommand -command $command
$result.Output.headers."Content-Type" | Should -BeExactly 'application/json'
}

It "Invoke-RestMethod supports sending requests as UTF8" {
$uri = Get-WebListenerUrl -Test POST
# Body must contain non-ASCII characters
Expand Down