Skip to content

Fix Set-Location to only use filesystem directory (if exists) only if using FileSystem provider #6654

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

Closed
SteveL-MSFT wants to merge 2 commits into from
Closed

Fix Set-Location to only use filesystem directory (if exists) only if using FileSystem provider #6654

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
93e07ad
add check to optimization for return folder if it exists to only work…
SteveL-MSFT Apr 14, 2018
6e18896
add test
SteveL-MSFT Apr 29, 2018
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
8 changes: 5 additions & 3 deletions src/System.Management.Automation/namespaces/LocationGlobber.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,10 +501,10 @@ private Collection<PathInfo> ResolveDriveQualifiedPath(

Collection<string> stringResult = new Collection<string>();

// if the directory exists, just return it
// If filesystem provider and the directory exists, just return it.
try
{
if (Utils.NativeDirectoryExists(userPath))
if (provider.Name.Equals(Microsoft.PowerShell.Commands.FileSystemProvider.ProviderName, StringComparison.OrdinalIgnoreCase) && Utils.NativeDirectoryExists(userPath))
{
result.Add(new PathInfo(drive, provider, userPath, _sessionState));
return result;
Expand Down Expand Up @@ -1750,7 +1750,9 @@ internal bool IsAbsolutePath(string path, out string driveName)
break;
}

// check if we're on a single root filesystem and it's an absolute path
// Check if we're on a single root filesystem and it's an absolute path.
// This means that even if we are in a PSDrive, on non-Windows a path starting
// with DirectorySeparatorChar will always refer to the filesystem.
if (IsSingleFileSystemAbsolutePath(path))
{
driveName = StringLiterals.DefaultPathSeparatorString;
Expand Down
17 changes: 17 additions & 0 deletions test/powershell/Modules/Microsoft.PowerShell.Management/Set-Location.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License.

Describe "Set-Location" -Tags "CI" {

BeforeAll {
Expand Down Expand Up @@ -53,6 +54,22 @@ Describe "Set-Location" -Tags "CI" {
$(Get-Location).Path | Should -BeExactly $testPath.FullName
}

It "Should not use filesystem root folder if not in filesystem provider" -Skip:(!$IsWindows) {
# find filesystem root folder that doesn't exist in HKCU:
$foundFolder = $false
foreach ($folder in (Get-ChildItem "${env:SystemDrive}\" -Directory)) {
if (!(Test-Path "HKCU:\$($folder.Name)")) {
$testFolder = $folder.Name
$foundFolder = $true
break
}
}
$foundFolder | Should -BeTrue
Set-Location HKCU:\
{ Set-Location ([System.IO.Path]::DirectorySeparatorChar + $testFolder) -ErrorAction Stop } |
Should -Throw -ErrorId "PathNotFound,Microsoft.PowerShell.Commands.SetLocationCommand"
}

Context 'Set-Location with no arguments' {

It 'Should go to $env:HOME when Set-Location run with no arguments from FileSystem provider' {
Expand Down