Skip to content

Fix PromptForCredential() to add targetName as domain #14504

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
adityapatwardhan merged 4 commits into from
Mar 8, 2021
Merged

Fix PromptForCredential() to add targetName as domain #14504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
022e0b0
Fix PromptForCredential() to add `targetName` as domain
SteveL-MSFT Dec 27, 2020
9058f64
add test
SteveL-MSFT Dec 28, 2020
af685c1
Update src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserI…
SteveL-MSFT Mar 6, 2021
7015cde
address Codefactor
SteveL-MSFT Mar 6, 2021
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
25 changes: 17 additions & 8 deletions src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterfaceSecurity.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,17 +97,26 @@ public override PSCredential PromptForCredential(
passwordPrompt = StringUtil.Format(ConsoleHostUserInterfaceSecurityResources.PromptForCredential_Password, userName
);

//
// now, prompt for the password
//
WriteToConsole(passwordPrompt, true);
password = ReadLineAsSecureString();
if (password == null)
if (!InternalTestHooks.NoPromptForPassword)
{
return null;
WriteToConsole(passwordPrompt, transcribeResult: true);
password = ReadLineAsSecureString();
if (password == null)
{
return null;
}

WriteLineToConsole();
}
else
{
password = new SecureString();
}

WriteLineToConsole();
if (!string.IsNullOrEmpty(targetName))
{
userName = StringUtil.Format("{0}\\{1}", targetName, userName);
}

cred = new PSCredential(userName, password);

Expand Down
1 change: 1 addition & 0 deletions src/System.Management.Automation/engine/Utils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2072,6 +2072,7 @@ public static class InternalTestHooks
internal static bool BypassOnlineHelpRetrieval;
internal static bool ForcePromptForChoiceDefaultOption;
internal static bool BypassOutputRedirectionCheck;
internal static bool NoPromptForPassword;

// Stop/Restart/Rename Computer tests
internal static bool TestStopComputer;
Expand Down
20 changes: 20 additions & 0 deletions test/powershell/Host/HostUtilities.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,23 @@ Describe "InvokeOnRunspace method on remote runspace" -tags "Feature","RequireAd
$results[0] | Should -Be "Hello!"
}
}

Describe 'PromptForCredential' {
BeforeAll {
[System.Management.Automation.Internal.InternalTestHooks]::SetTestHook('NoPromptForPassword', $true)
}

AfterAll {
[System.Management.Automation.Internal.InternalTestHooks]::SetTestHook('NoPromptForPassword', $false)
}

It 'Should accept no targetname' {
$out = $Host.UI.PromptForCredential('caption','message','myUser',$null)
$out.UserName | Should -BeExactly 'myUser'
}

It 'Should accept targetname as domain' {
$out = $Host.UI.PromptForCredential('caption','message','myUser','myDomain')
$out.UserName | Should -BeExactly 'myDomain\myUser'
}
}