Skip to content

Don't allow Move-Item with FileSystemProvider to move a directory into itself #16198

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 2 commits into from
Oct 12, 2021
Merged

Don't allow Move-Item with FileSystemProvider to move a directory into itself #16198

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
8fb0b1a
Don't allow `Move-Item` with FileSystemProvider to move a directory i…
SteveL-MSFT Oct 5, 2021
8e83e40
Update src/System.Management.Automation/namespaces/FileSystemProvider.cs
SteveL-MSFT Oct 5, 2021
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
9 changes: 9 additions & 0 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 @@ -5851,6 +5851,15 @@ protected override void MoveItem(
destination = MakePath(destination, dir.Name);
}

// Don't allow moving a directory into itself
if (destination.StartsWith(Path.TrimEndingDirectorySeparator(path) + Path.DirectorySeparatorChar))
{
string error = StringUtil.Format(FileSystemProviderStrings.TargetCannotBeSubdirectoryOfSource, destination);
var e = new IOException(error);
WriteError(new ErrorRecord(e, "MoveItemArgumentError", ErrorCategory.InvalidArgument, destination));
return;
}

// Get the confirmation text
string action = FileSystemProviderStrings.MoveItemActionDirectory;

Expand Down
3 changes: 3 additions & 0 deletions src/System.Management.Automation/resources/FileSystemProviderStrings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,4 +345,7 @@
<data name="AlreadyListedDirectory" xml:space="preserve">
<value>Skip already-visited directory {0}.</value>
</data>
<data name="TargetCannotBeSubdirectoryOfSource" xml:space="preserve">
<value>Destination path cannot be a subdirectory of the source: {0}.</value>
</data>
</root>
14 changes: 14 additions & 0 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 @@ -187,6 +187,20 @@ Describe "Basic FileSystem Provider Tests" -Tags "CI" {
$e.Exception | Should -BeOfType System.IO.IOException
}

It 'Verify Move-Item fails for destination that is subdir of source with trailing: <trailingChar>' -TestCases @(
@{ trailingChar = [System.IO.Path]::DirectorySeparatorChar }
@{ trailingChar = [System.IO.Path]::AltDirectorySeparatorChar }
@{ trailingChar = '' }
) {
param($trailingChar)

$dest = Join-Path -Path $TestDrive -ChildPath dest
$null = New-item -ItemType Directory -Path $dest -Force -ErrorAction Stop
$src = "$TestDrive$trailingChar"

{ Move-Item -Path $src -Destination $dest -ErrorAction Stop } | Should -Throw -ErrorId 'MoveItemArgumentError,Microsoft.PowerShell.Commands.MoveItemCommand'
}

It "Verify Move-Item throws correct error for non-existent source" {
{ Move-Item -Path /does/not/exist -Destination $testFile -ErrorAction Stop } | Should -Throw -ErrorId 'PathNotFound,Microsoft.PowerShell.Commands.MoveItemCommand'
}
Expand Down