Skip to content

Limit credentials to the origin host #28399

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
Justin Chung (jshigetomi) wants to merge 2 commits into
base: master
Choose a base branch
from
+78 −10
Open

Limit credentials to the origin host #28399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0cb7411
Tie credentials to origin host (#240)
Nov 5, 2026
e6da01b
Merge branch 'master' into 240bp
jshigetomi Nov 12, 2026
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
4 changes: 2 additions & 2 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 @@ -924,8 +924,7 @@ internal virtual void PrepareSession()
if (Credential is not null && Authentication == WebAuthenticationType.None)
{
// Get the relevant NetworkCredential
NetworkCredential netCred = Credential.GetNetworkCredential();
WebSession.Credentials = netCred;
WebSession.SetCredential(Credential.GetNetworkCredential(), CheckProtocol(Uri), PreserveAuthorizationOnRedirect);

// Supplying a credential overrides the UseDefaultCredentials setting
WebSession.UseDefaultCredentials = false;
Expand All @@ -937,6 +936,7 @@ internal virtual void PrepareSession()
else if (UseDefaultCredentials)
{
WebSession.UseDefaultCredentials = true;
WebSession.SetCredential(CredentialCache.DefaultNetworkCredentials, CheckProtocol(Uri), PreserveAuthorizationOnRedirect);
}

if (CertificateThumbprint is not null)
Expand Down
24 changes: 24 additions & 0 deletions src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/WebRequestSession.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,30 @@ internal bool NoProxy
}
}

internal void SetCredential(NetworkCredential cred, Uri uri, bool preserveAuthOnRedirect)
{
if (preserveAuthOnRedirect)
{
Credentials = cred;
return;
}

Uri origin = new(uri.GetLeftPart(UriPartial.Authority));
CredentialCache cache = new();

// DefaultCredentials only supports a limited subset of schemes.
string[] schemes = ReferenceEquals(cred, CredentialCache.DefaultNetworkCredentials)
? new[] { "NTLM", "Kerberos", "Negotiate" }
: new[] { "Basic", "Digest", "NTLM", "Kerberos", "Negotiate" };

foreach (string scheme in schemes)
{
cache.Add(origin, scheme, cred);
}

Credentials = cache;
}

/// <summary>
/// Add a X509Certificate to the Certificates collection.
/// </summary>
Expand Down
60 changes: 52 additions & 8 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 @@ -1988,16 +1988,38 @@ Describe "Invoke-WebRequest tests" -Tags "Feature", "RequireAdminOnWindows" {
{ Invoke-WebRequest @params } | Should -Throw -ErrorId "WebCmdletAllowUnencryptedAuthenticationRequiredException,Microsoft.PowerShell.Commands.InvokeWebRequestCommand"
}

It "Verifies Invoke-WebRequest Negotiated -Credential Can use HTTP with -AllowUnencryptedAuthentication" {
It "Verifies Invoke-WebRequest Negotiated -Credential Can use HTTP with -AllowUnencryptedAuthentication (WithoutScheme: <WithoutScheme>, PreserveAuthorizationOnRedirect: <PreserveAuthorizationOnRedirect>)" -TestCases @(
@{WithoutScheme = $false; PreserveAuthorizationOnRedirect = $false}
@{WithoutScheme = $true; PreserveAuthorizationOnRedirect = $false}
@{WithoutScheme = $false; PreserveAuthorizationOnRedirect = $true}
@{WithoutScheme = $true; PreserveAuthorizationOnRedirect = $true}
) {
param($WithoutScheme, $PreserveAuthorizationOnRedirect)

$params = @{
Uri = $httpBasicUri
Credential = $credential
AllowUnencryptedAuthentication = $true
Uri = if ($WithoutScheme) { $httpBasicUri -replace '^http://', '' } else { $httpBasicUri }
Credential = $credential
AllowUnencryptedAuthentication = $true
SessionVariable = 'credentialSession'
PreserveAuthorizationOnRedirect = $PreserveAuthorizationOnRedirect
}
$Response = Invoke-WebRequest @params
$result = $response.Content | ConvertFrom-Json

$result.Headers.Authorization | Should -BeExactly "Basic dGVzdHVzZXI6dGVzdHBhc3N3b3Jk"

foreach ($scheme in 'Basic', 'Digest', 'NTLM', 'Negotiate') {
$otherPath = [uri]::new([uri]$httpBasicUri, '/other-directory/resource')
$credentialSession.Credentials.GetCredential($otherPath, $scheme).UserName | Should -BeExactly 'testuser'
$otherOrigin = [System.UriBuilder]::new($otherPath)
$otherOrigin.Host = 'different.invalid'
if ($PreserveAuthorizationOnRedirect) {
$credentialSession.Credentials.GetCredential($otherOrigin.Uri, $scheme).UserName | Should -BeExactly 'testuser'
} else {
$credentialSession.Credentials.GetCredential($otherOrigin.Uri, $scheme) | Should -BeNullOrEmpty
}
}
$credentialSession.Dispose()
}

# UseDefaultCredentials is only reliably testable on Windows
Expand Down Expand Up @@ -4031,15 +4053,37 @@ Describe "Invoke-RestMethod tests" -Tags "Feature", "RequireAdminOnWindows" {
{ Invoke-RestMethod @params } | Should -Throw -ErrorId "WebCmdletAllowUnencryptedAuthenticationRequiredException,Microsoft.PowerShell.Commands.InvokeRestMethodCommand"
}

It "Verifies Invoke-RestMethod Negotiated -Credential Can use HTTP with -AllowUnencryptedAuthentication" {
It "Verifies Invoke-RestMethod Negotiated -Credential Can use HTTP with -AllowUnencryptedAuthentication (WithoutScheme: <WithoutScheme>, PreserveAuthorizationOnRedirect: <PreserveAuthorizationOnRedirect>)" -TestCases @(
@{WithoutScheme = $false; PreserveAuthorizationOnRedirect = $false}
@{WithoutScheme = $true; PreserveAuthorizationOnRedirect = $false}
@{WithoutScheme = $false; PreserveAuthorizationOnRedirect = $true}
@{WithoutScheme = $true; PreserveAuthorizationOnRedirect = $true}
) {
param($WithoutScheme, $PreserveAuthorizationOnRedirect)

$params = @{
Uri = $httpBasicUri
Credential = $credential
AllowUnencryptedAuthentication = $true
Uri = if ($WithoutScheme) { $httpBasicUri -replace '^http://', '' } else { $httpBasicUri }
Credential = $credential
AllowUnencryptedAuthentication = $true
SessionVariable = 'credentialSession'
PreserveAuthorizationOnRedirect = $PreserveAuthorizationOnRedirect
}
$result = Invoke-RestMethod @params

$result.Headers.Authorization | Should -BeExactly "Basic dGVzdHVzZXI6dGVzdHBhc3N3b3Jk"

foreach ($scheme in 'Basic', 'Digest', 'NTLM', 'Negotiate') {
$otherPath = [uri]::new([uri]$httpBasicUri, '/other-directory/resource')
$credentialSession.Credentials.GetCredential($otherPath, $scheme).UserName | Should -BeExactly 'testuser'
$otherOrigin = [System.UriBuilder]::new($otherPath)
$otherOrigin.Host = 'different.invalid'
if ($PreserveAuthorizationOnRedirect) {
$credentialSession.Credentials.GetCredential($otherOrigin.Uri, $scheme).UserName | Should -BeExactly 'testuser'
} else {
$credentialSession.Credentials.GetCredential($otherOrigin.Uri, $scheme) | Should -BeNullOrEmpty
}
}
$credentialSession.Dispose()
}

# UseDefaultCredentials is only reliably testable on Windows
Expand Down
Loading