Skip to content

Prevent Get-ChildItem from recursing into symlinks (#1875). #3780

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
May 15, 2017
Merged

Prevent Get-ChildItem from recursing into symlinks (#1875). #3780

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
8dbbab5
Prevent Get-ChildItem from recursing into symlinks (#1875).
May 13, 2017
840f25f
Change an "if" pattern, per code review.
May 14, 2017
8b782b1
Changes per code review.
May 15, 2017
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
26 changes: 18 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 @@ -1736,15 +1736,25 @@ private void Dir(
return;
}


bool hidden = false;
if (!Force) hidden = (recursiveDirectory.Attributes & FileAttributes.Hidden) != 0;

// if "Hidden" is explicitly specified anywhere in the attribute filter, then override
// default hidden attribute filter.
if (Force || !hidden || isFilterHiddenSpecified || isSwitchFilterHiddenSpecified)
// Once the recursion process has begun by being in this function,
// we do not want to further recurse into directory symbolic links
// so as to prevent the possibility of an endless symlink loop.
// This is the behavior of both the Unix 'ls' command and the Windows
// 'DIR' command.
if (!InternalSymbolicLinkLinkCodeMethods.IsReparsePoint(recursiveDirectory))
{
Dir(recursiveDirectory, recurse, depth - 1, nameOnly, returnContainers);
bool hidden = false;
if (!Force)
{
hidden = (recursiveDirectory.Attributes & FileAttributes.Hidden) != 0;
}

// if "Hidden" is explicitly specified anywhere in the attribute filter, then override
// default hidden attribute filter.
if (Force || !hidden || isFilterHiddenSpecified || isSwitchFilterHiddenSpecified)
{
Dir(recursiveDirectory, recurse, depth - 1, nameOnly, returnContainers);
}
}
}//foreach
}//if
Expand Down
45 changes: 30 additions & 15 deletions test/powershell/Modules/Microsoft.PowerShell.Management/FileSystem.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,27 +372,42 @@ Describe "Hard link and symbolic link tests" -Tags "CI", "RequireAdminOnWindows"

Context "Get-ChildItem and symbolic links" {
BeforeAll {
$subDir = Join-Path $TestDrive "bar"
$subLink = Join-Path $TestDrive "foo"
$subFile1 = Join-Path $subDir "File1.txt"
$subFile2 = Join-Path $subDir "File2.txt"

New-Item -ItemType Directory -Path $subDir
New-Item -ItemType File -Path $subFile1
New-Item -ItemType File -Path $subFile2

$filenamePattern = "File[12]\.txt"
$TestDrive = "TestDrive:"
$alphaDir = Join-Path $TestDrive "sub-alpha"
$alphaLink = Join-Path $TestDrive "link-alpha"
$alphaFile1 = Join-Path $alphaDir "AlphaFile1.txt"
$alphaFile2 = Join-Path $alphaDir "AlphaFile2.txt"
$betaDir = Join-Path $alphaDir "sub-beta"
$betaLink = Join-Path $alphaDir "link-beta"
$betaFile1 = Join-Path $betaDir "BetaFile1.txt"
$betaFile2 = Join-Path $betaDir "BetaFile2.txt"
$betaFile3 = Join-Path $betaDir "BetaFile3.txt"

New-Item -ItemType Directory -Path $alphaDir
New-Item -ItemType File -Path $alphaFile1
New-Item -ItemType File -Path $alphaFile2
New-Item -ItemType Directory -Path $betaDir
New-Item -ItemType File -Path $betaFile1
New-Item -ItemType File -Path $betaFile2
New-Item -ItemType File -Path $betaFile3
}
AfterAll {
Remove-Item -Path $subLink -Force
Remove-Item -Path $alphaLink -Force -ErrorAction SilentlyContinue
Remove-Item -Path $betaLink -Force -ErrorAction SilentlyContinue
}

It "Get-ChildItem gets content of linked-to directory" {
New-Item -ItemType SymbolicLink -Path $subLink -Value $subDir
$ci = Get-ChildItem $subLink
$ci.Count | Should BeExactly 2
$ci[0].Name | Should MatchExactly $filenamePattern
$filenamePattern = "AlphaFile[12]\.txt"
New-Item -ItemType SymbolicLink -Path $alphaLink -Value $alphaDir
$ci = Get-ChildItem $alphaLink
$ci.Count | Should BeExactly 3
$ci[1].Name | Should MatchExactly $filenamePattern
$ci[2].Name | Should MatchExactly $filenamePattern
}
It "Get-ChildItem does not recurse into symbolic links not explicitly given on the command line" {
New-Item -ItemType SymbolicLink -Path $betaLink -Value $betaDir
$ci = Get-ChildItem $alphaLink -Recurse
$ci.Count | Should BeExactly 7
}
}

Expand Down