Skip to content

Have console host not enter command prompt mode when using Read-Host -Prompt #9743

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
daxian-dbw merged 3 commits into from
Jun 9, 2019
Merged

Have console host not enter command prompt mode when using Read-Host -Prompt #9743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0cf1ed8
Have console host not enter command prompt mode when using `Read-Host…
SteveL-MSFT May 28, 2019
e4d3956
Update test/powershell/Modules/Microsoft.PowerShell.Utility/Read-Host…
SteveL-MSFT May 31, 2019
b928034
fix test to not expect prompt to be in stdout on Windows
SteveL-MSFT Jun 5, 2019
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
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterfacePrompt.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ private string PromptReadInput(string fieldPrompt, FieldDescription desc, bool f
break;
}
else
if (rawInputString.StartsWith(PromptCommandPrefix, StringComparison.Ordinal))
if (!string.IsNullOrEmpty(desc.Label) && rawInputString.StartsWith(PromptCommandPrefix, StringComparison.Ordinal))
{
processedInputString = PromptCommandMode(rawInputString, desc, out inputDone);
}
Expand Down
18 changes: 17 additions & 1 deletion test/powershell/Modules/Microsoft.PowerShell.Utility/Read-Host.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,44 @@ Describe "Read-Host Test" -tag "CI" {
$ps.Runspace = $rs
$ps.Commands.Clear()
}

AfterEach {
$ps.Commands.Clear()
}

AfterAll {
$rs.Close()
$rs.Dispose()
$ps.Dispose()
}

It "Read-Host returns expected string" {
$result = $ps.AddCommand("Read-Host").Invoke()
$result | Should -Be $th.UI.ReadLineData
}

It "Read-Host sets the prompt correctly" {
$result = $ps.AddScript("Read-Host -prompt myprompt").Invoke()
$prompt = $th.ui.streams.prompt[0]
$prompt | Should -Not -BeNullOrEmpty
$prompt.split(":")[-1] | Should -Be myprompt
}

It "Read-Host returns a secure string when using -AsSecureString parameter" {
$result = $ps.AddScript("Read-Host -AsSecureString").Invoke() | select-object -first 1
$result | Should -BeOfType SecureString
[pscredential]::New("foo",$result).GetNEtworkCredential().Password | Should -BeExactly TEST
[pscredential]::New("foo",$result).GetNetworkCredential().Password | Should -BeExactly TEST
}

It "Read-Host doesn't enter command prompt mode" {
$result = "!1" | pwsh -NoProfile -c "Read-host -Prompt 'foo'"
if ($IsWindows) {
# Windows write to console directly so can't capture prompt in stdout
$expected = @('!1','!1')
}
else {
$expected = @('foo: !1','!1')
}
$result | should -BeExactly $expected
}
}