admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

[feature]

Browse Source 
removed code to show a GUI prompt for credentials as PSCore6 prompts in console
This commit is contained in:
Steve Lee
2017-10-12 10:19:18 -07:00
parent 5bd8dd351f
commit 6ca5d51782
2 changed files with 47 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterfacePrompt.cs
+6 -25
View File
@@ -315,31 +315,12 @@ namespace Microsoft.PowerShell
{
WriteLineToConsole(WrapToCurrentWindowWidth(fieldPrompt));
PSCredential credential = null;
// the earlier implementation contained null
// for caption and message in the call below
// Passing null is a potential security risk
// as any modifications made with security in
// mind is lost. This can lead to a malicious
// server prompting the user for a request
// which can appear to come from locally.
if (!PromptUsingConsole() && desc.ModifiedByRemotingProtocol)
{
credential =
PromptForCredential(
caption,
message,
null,
string.Empty);
}
else
{
credential =
PromptForCredential(
null, // caption already written
null, // message already written
null,
string.Empty);
}
credential =
PromptForCredential(
null, // caption already written
null, // message already written
null,
string.Empty);
convertedObj = credential;
cancelInput = (convertedObj == null);
if ((credential != null) && (credential.Password.Length == 0) && listInput)
src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterfaceSecurity.cs
+41 -107
View File
@@ -78,127 +78,61 @@ namespace Microsoft.PowerShell
PSCredentialTypes allowedCredentialTypes,
PSCredentialUIOptions options)
{
if (!PromptUsingConsole())
PSCredential cred = null;
SecureString password = null;
string userPrompt = null;
string passwordPrompt = null;
if (!string.IsNullOrEmpty(caption))
{
IntPtr mainWindowHandle = GetMainWindowHandle();
return HostUtilities.CredUIPromptForCredential(caption, message, userName, targetName, allowedCredentialTypes, options, mainWindowHandle);
}
else
{
PSCredential cred = null;
SecureString password = null;
string userPrompt = null;
string passwordPrompt = null;
// Should be a skin lookup
if (!string.IsNullOrEmpty(caption))
{
// Should be a skin lookup
WriteLineToConsole();
WriteToConsole(PromptColor, RawUI.BackgroundColor, WrapToCurrentWindowWidth(caption));
WriteLineToConsole();
}
if (!string.IsNullOrEmpty(message))
{
WriteLineToConsole(WrapToCurrentWindowWidth(message));
}
if (string.IsNullOrEmpty(userName))
{
userPrompt = ConsoleHostUserInterfaceSecurityResources.PromptForCredential_User;
//
// need to prompt for user name first
//
do
{
WriteToConsole(userPrompt, true);
userName = ReadLine();
if (userName == null)
{
return null;
}
}
while (userName.Length == 0);
}
passwordPrompt = StringUtil.Format(ConsoleHostUserInterfaceSecurityResources.PromptForCredential_Password, userName
);
//
// now, prompt for the password
//
WriteToConsole(passwordPrompt, true);
password = ReadLineAsSecureString();
if (password == null)
{
return null;
}
WriteLineToConsole();
cred = new PSCredential(userName, password);
return cred;
WriteToConsole(PromptColor, RawUI.BackgroundColor, WrapToCurrentWindowWidth(caption));
WriteLineToConsole();
}
}
private IntPtr GetMainWindowHandle()
{
#if CORECLR // No System.Diagnostics.Process.MainWindowHandle on CoreCLR;
// Returned WindowHandle is used only in 1 case - prompting for credential using GUI dialog, which is not used on Nano,
// because on Nano we prompt for credential using console (different code path in 'PromptForCredential' function)
return IntPtr.Zero;
#else
System.Diagnostics.Process currentProcess = System.Diagnostics.Process.GetCurrentProcess();
IntPtr mainWindowHandle = currentProcess.MainWindowHandle;
while ((mainWindowHandle == IntPtr.Zero) && (currentProcess != null))
if (!string.IsNullOrEmpty(message))
{
currentProcess = PsUtils.GetParentProcess(currentProcess);
if (currentProcess != null)
WriteLineToConsole(WrapToCurrentWindowWidth(message));
}
if (string.IsNullOrEmpty(userName))
{
userPrompt = ConsoleHostUserInterfaceSecurityResources.PromptForCredential_User;
//
// need to prompt for user name first
//
do
{
mainWindowHandle = currentProcess.MainWindowHandle;
WriteToConsole(userPrompt, true);
userName = ReadLine();
if (userName == null)
{
return null;
}
}
while (userName.Length == 0);
}
return mainWindowHandle;
#endif
}
passwordPrompt = StringUtil.Format(ConsoleHostUserInterfaceSecurityResources.PromptForCredential_Password, userName
);
// Determines whether we should prompt using the Console prompting
// APIs
private bool PromptUsingConsole()
{
#if CORECLR
// on Nano there is no other way to prompt except by using console
return true;
#else
bool promptUsingConsole = false;
// Get the configuration setting
try
//
// now, prompt for the password
//
WriteToConsole(passwordPrompt, true);
password = ReadLineAsSecureString();
if (password == null)
{
promptUsingConsole = ConfigPropertyAccessor.Instance.GetConsolePrompting();
}
catch (System.Security.SecurityException e)
{
s_tracer.TraceError("Could not read CredUI registry key: " + e.Message);
return promptUsingConsole;
}
catch (InvalidCastException e)
{
s_tracer.TraceError("Could not parse CredUI registry key: " + e.Message);
return promptUsingConsole;
}
catch (FormatException e)
{
s_tracer.TraceError("Could not parse CredUI registry key: " + e.Message);
return promptUsingConsole;
return null;
}
WriteLineToConsole();
s_tracer.WriteLine("DetermineCredUIPolicy: policy == {0}", promptUsingConsole);
return promptUsingConsole;
#endif
cred = new PSCredential(userName, password);
return cred;
}
}
}