Skip to content

Fix to fallback to utf-8 when provided an invalid charset in web responses #27789

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

Open
Ryan Yates (kilasuit) wants to merge 1 commit into
base: master
Choose a base branch
from
+37 −3
Open

Fix to fallback to utf-8 when provided an invalid charset in web responses #27789

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 37 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 @@ -1609,9 +1609,43 @@

if (ContentHelper.IsTextBasedContentType(ContentHelper.GetContentType(response)))
{
debugBuilder.AppendLine(
response.Content.ReadAsStringAsync(_cancelToken.Token)
.GetAwaiter().GetResult());
string body;

try
{
// Normal path
body = response.Content
.ReadAsStringAsync(_cancelToken.Token)
.GetAwaiter().GetResult();
}
catch (InvalidOperationException)
{
// Fallback for invalid charset (e.g., "utf8")
var headers = response.Content.Headers;
string charset = headers?.ContentType?.CharSet;

Check failure on line 1625 in src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs

View workflow job for this annotation

GitHub Actions / Build PowerShell 

Converting null literal or possible null value to non-nullable type.

Check failure on line 1625 in src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs

View workflow job for this annotation

GitHub Actions / xUnit Tests / Run xUnit Tests 

Converting null literal or possible null value to non-nullable type.

Check failure on line 1625 in src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs

View workflow job for this annotation

GitHub Actions / Build PowerShell 

Converting null literal or possible null value to non-nullable type.

Check failure on line 1625 in src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs

View workflow job for this annotation

GitHub Actions / xUnit Tests / Run xUnit Tests 

Converting null literal or possible null value to non-nullable type.

Check failure on line 1625 in src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs

View workflow job for this annotation

GitHub Actions / CodeQL Analysis / Analyze (csharp) 

Converting null literal or possible null value to non-nullable type.

Check failure on line 1625 in src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs

View workflow job for this annotation

GitHub Actions / Build PowerShell 

Converting null literal or possible null value to non-nullable type.

Check failure on line 1625 in src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs

View workflow job for this annotation

GitHub Actions / xUnit Tests / Run xUnit Tests 

Converting null literal or possible null value to non-nullable type.

Encoding encoding;

try
{
encoding = !string.IsNullOrEmpty(charset)
? Encoding.GetEncoding(charset)
: Encoding.UTF8;
}
catch (ArgumentException)
{
// Final fallback
encoding = Encoding.UTF8;
}

var bytes = response.Content
.ReadAsByteArrayAsync(_cancelToken.Token)
.GetAwaiter().GetResult();

body = encoding.GetString(bytes);
}

debugBuilder.AppendLine(body);
}
else
{
Expand Down
Loading