Skip to content

Write proper error messages for Get-Command ' ' #13564

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
iSazonov merged 12 commits into from
Jan 10, 2021
Merged

Write proper error messages for Get-Command ' ' #13564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
abcfb59
Remove an unnecessary dbg.assert()
jakekerr Aug 27, 2020
ed7328b
Add IsNullOrEmpty check to relative path lookup.
jakekerr Sep 2, 2020
e451c53
Add test case for single whitespace name parameter
jakekerr Sep 4, 2020
934e214
Check for _commandName length in setupPathSearcher
jakekerr Sep 6, 2020
1d5c83c
Added tests for whitespace, empty and null names
jakekerr Sep 6, 2020
033e766
Remove commented out code.
jakekerr Sep 6, 2020
58f63e0
Moved _commandName length conditional check.
jakekerr Sep 7, 2020
a8cbd6e
Remove unused variable.
jakekerr Sep 7, 2020
2014b42
Remove extra empty line.
jakekerr Sep 8, 2020
d262767
use Name variable for headers and value for tests.
jakekerr Sep 8, 2020
df6bda7
Capitalized Name header and put it in single quote
jakekerr Sep 8, 2020
b571656
Merge branch 'master' of https://github.com/jackerr3/PowerShell into …
jakekerr Sep 8, 2020
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
10 changes: 4 additions & 6 deletions src/System.Management.Automation/engine/CommandSearcher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1087,7 +1087,7 @@ private bool ShouldSkipCommandResolutionForConstrainedLanguage(CommandInfo? resu
string? result = null;

if (_context.EngineSessionState != null &&
_context.EngineSessionState.ProviderCount > 0)
_context.EngineSessionState.ProviderCount > 0 && _commandName.Length != 0)
{
// NTRAID#Windows OS Bugs-1009294-2004/02/04-JeffJon
// This is really slow. Maybe since we are only allowing FS paths right
Expand All @@ -1099,7 +1099,9 @@ private bool ShouldSkipCommandResolutionForConstrainedLanguage(CommandInfo? resu
// Relative Path: ".\command.exe"
// Home Path: "~\command.exe"
// Drive Relative Path: "\Users\User\AppData\Local\Temp\command.exe"
if (_commandName[0] == '.' || _commandName[0] == '~' || _commandName[0] == '\\')

char firstChar = _commandName[0];
if (firstChar == '.' || firstChar == '~' || firstChar == '\\')
{
using (CommandDiscovery.discoveryTracer.TraceScope(
"{0} appears to be a relative path. Trying to resolve relative path",
Expand Down Expand Up @@ -1334,10 +1336,6 @@ private bool ShouldSkipCommandResolutionForConstrainedLanguage(CommandInfo? resu
/// </exception>
internal LookupPathCollection ConstructSearchPatternsFromName(string name, bool commandDiscovery = false)
{
Dbg.Assert(
!string.IsNullOrEmpty(name),
"Caller should verify name");

var result = new LookupPathCollection();

// First check to see if the commandName has an extension, if so
Expand Down
9 changes: 9 additions & 0 deletions test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Command.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,5 +178,14 @@ Describe "Get-Command" -Tag CI {

$Result | Should -BeOfType [System.Management.Automation.CommandInfo]
}

It "Throws '<expected>' exception if '<Name>' name is used" -TestCases @(
@{ Name = 'space'; Value = ' '; expected = "CommandNotFoundException,Microsoft.PowerShell.Commands.GetCommandCommand" }
@{ Name = 'empty'; Value = ''; expected = "ParameterArgumentValidationError,Microsoft.PowerShell.Commands.GetCommandCommand" }
@{ Name = 'null'; Value = $null; expected = "ParameterArgumentValidationError,Microsoft.PowerShell.Commands.GetCommandCommand" }
) {
param($value, $expected)
{ Get-Command $value -ErrorAction Stop } | Should -Throw -ErrorId $expected
}
}
}