Skip to content

Fix FileSystemProvider to work with volume and pipe paths #15873

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 6 commits into from
Jul 25, 2022
Merged

Fix FileSystemProvider to work with volume and pipe paths #15873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e6044a5
Fix FileSystemProvider to work with volume paths
SteveL-MSFT Aug 4, 2021
2dc83d2
address Ilya's feedback moving the check into PathIsUnc()
SteveL-MSFT Aug 5, 2021
5e8c051
add parameter to PathIsUnc to only check for Unc path
SteveL-MSFT Aug 5, 2021
250dc65
add support for \\.\pipe\
SteveL-MSFT Aug 13, 2021
e9963e4
update comment
SteveL-MSFT Aug 13, 2021
ae2ad68
Update test/powershell/Modules/Microsoft.PowerShell.Management/Get-Ch…
adityapatwardhan Jul 25, 2022
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
6 changes: 3 additions & 3 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 @@ -1281,7 +1281,7 @@ internal static bool IsReservedDeviceName(string destinationPath)
return false;
}

internal static bool PathIsUnc(string path)
internal static bool PathIsUnc(string path, bool networkOnly = false)
{
#if UNIX
return false;
Expand All @@ -1291,8 +1291,8 @@ internal static bool PathIsUnc(string path)
return false;
}

// handle special cases like \\wsl$\ubuntu which isn't a UNC path, but we can say it is so the filesystemprovider can use it
if (path.StartsWith(WslRootPath, StringComparison.OrdinalIgnoreCase))
// handle special cases like '\\wsl$\ubuntu', '\\?\', and '\\.\pipe\' which aren't a UNC path, but we can say it is so the filesystemprovider can use it
if (!networkOnly && (path.StartsWith(WslRootPath, StringComparison.OrdinalIgnoreCase) || path.StartsWith("\\\\?\\") || path.StartsWith("\\\\.\\")))
{
return true;
}
Expand Down
17 changes: 9 additions & 8 deletions src/System.Management.Automation/namespaces/FileSystemProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,20 +132,21 @@ private static string GetCorrectCasedPath(string path)
itemsToSkip = 4;
}

foreach (string item in path.Split(StringLiterals.DefaultPathSeparator))
var items = path.Split(StringLiterals.DefaultPathSeparator);
for (int i = 0; i < items.Length; i++)
{
if (itemsToSkip-- > 0)
{
// This handles the UNC server and share and 8.3 short path syntax
exactPath += item + StringLiterals.DefaultPathSeparator;
exactPath += items[i] + StringLiterals.DefaultPathSeparator;
continue;
}
else if (string.IsNullOrEmpty(exactPath))
{
// This handles the drive letter or / root path start
exactPath = item + StringLiterals.DefaultPathSeparator;
exactPath = items[i] + StringLiterals.DefaultPathSeparator;
}
else if (string.IsNullOrEmpty(item))
else if (string.IsNullOrEmpty(items[i]) && i == items.Length - 1)
{
// This handles the trailing slash case
if (!exactPath.EndsWith(StringLiterals.DefaultPathSeparator))
Expand All @@ -155,17 +156,17 @@ private static string GetCorrectCasedPath(string path)

break;
}
else if (item.Contains('~'))
else if (items[i].Contains('~'))
{
// This handles short path names
exactPath += StringLiterals.DefaultPathSeparator + item;
exactPath += StringLiterals.DefaultPathSeparator + items[i];
}
else
{
// Use GetFileSystemEntries to get the correct casing of this element
try
{
var entries = Directory.GetFileSystemEntries(exactPath, item);
var entries = Directory.GetFileSystemEntries(exactPath, items[i]);
if (entries.Length > 0)
{
exactPath = entries[0];
Expand Down Expand Up @@ -7257,7 +7258,7 @@ internal static bool PathIsNetworkPath(string path)
return false;
}

if (Utils.PathIsUnc(path))
if (Utils.PathIsUnc(path, networkOnly : true))
{
return true;
}
Expand Down
12 changes: 12 additions & 0 deletions test/powershell/Modules/Microsoft.PowerShell.Management/Get-ChildItem.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,18 @@ Describe "Get-ChildItem" -Tags "CI" {
$barFiles = Get-ChildItem -Path testdrive:/foo/bar -Recurse
$barFiles.Count | Should -Be 2
}

It 'Works with Windows volume paths' -Skip:(!$IsWindows) {
$volume = (Get-Volume -DriveLetter $env:SystemDrive[0]).Path
$items = Get-ChildItem -LiteralPath "${volume}Windows"
$items[0].Parent | Should -BeExactly "${volume}Windows"
$items | Should -HaveCount (Get-ChildItem $env:SystemRoot).Count
}

It 'Works with Windows pipes' -Skip:(!$IsWindows) {
$out = pwsh -noprofile -custompipename myTestPipe { Get-ChildItem \\.\pipe\myTestPipe }
$out.Name | Should -BeExactly 'myTestPipe'
}
}

Context 'Env: Provider' {
Expand Down