maxmustermann/PowerShell
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add Support for Null Usernames in Web Cmdlet Basic Auth (#9536)

Browse source
This commit is contained in:
Mark Kraus 2019-05-06 17:15:04 -07:00 committed by Aditya Patwardhan
parent 2737e74d86
commit 935e164a6d
2 changed files with 29 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs
View file

@ -805,7 +805,8 @@ namespace Microsoft.PowerShell.Commands
private string GetBasicAuthorizationHeader()
{
string unencoded = string.Format("{0}:{1}", Credential.UserName, Credential.GetNetworkCredential().Password);
var password = new NetworkCredential(null, Credential.Password).Password;
string unencoded = string.Format("{0}:{1}", Credential.UserName, password);
byte[] bytes = Encoding.UTF8.GetBytes(unencoded);
return string.Format("Basic {0}", Convert.ToBase64String(bytes));
}

27
test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1
View file

@ -1455,6 +1455,20 @@ Describe "Invoke-WebRequest tests" -Tags "Feature", "RequireAdminOnWindows" {
$result.Headers.Authorization | Should -BeExactly "Basic dGVzdHVzZXI6dGVzdHBhc3N3b3Jk"
}
It "Verifies Invoke-WebRequest -Authentication Basic with null username" {
$credential = [pscredential]::new([PSCustomObject]@{UserName = $null;Password=$token.psobject.BaseObject})
$params = @{
Uri = $httpsUri
Authentication = "Basic"
Credential = $credential
SkipCertificateCheck = $true
}
$Response = Invoke-WebRequest @params
$result = $response.Content | ConvertFrom-Json
$result.Headers.Authorization | Should -BeExactly "Basic OnRlc3RwYXNzd29yZA=="
}
It "Verifies Invoke-WebRequest -Authentication <Authentication>" -TestCases $testCases {
param($Authentication)
$params = @{
@ -2779,6 +2793,19 @@ Describe "Invoke-RestMethod tests" -Tags "Feature", "RequireAdminOnWindows" {
$result.Headers.Authorization | Should -BeExactly "Basic dGVzdHVzZXI6dGVzdHBhc3N3b3Jk"
}
It "Verifies Invoke-RestMethod -Authentication Basic with null username" {
$credential = [pscredential]::new([PSCustomObject]@{UserName = $null;Password=$token.psobject.BaseObject})
$params = @{
Uri = $httpsUri
Authentication = "Basic"
Credential = $credential
SkipCertificateCheck = $true
}
$Response = Invoke-RestMethod @params
$Response.Headers.Authorization | Should -BeExactly "Basic OnRlc3RwYXNzd29yZA=="
}
It "Verifies Invoke-RestMethod -Authentication <Authentication>" -TestCases $testCases {
param($Authentication)
$params = @{