Skip to content

Make New-Item -Force overwrite on Junction #18311

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 10 commits into from
May 2, 2023
Merged

Make New-Item -Force overwrite on Junction #18311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c329021
Refactor New-Item for Junction to allow force on Dir with Childitems
Oct 17, 2022
63a9aff
Put on my glasses before moving code
Oct 17, 2022
81d66c4
Recreate path after delete.
Oct 17, 2022
9ee044e
Add target check to test (WIP)
Oct 18, 2022
dda7688
add setup to get error to throw
Oct 19, 2022
8fe15e5
Move lines out of try/catch to avoid race condition
Oct 19, 2022
575d444
caught fleeing brace
Oct 19, 2022
c6288ef
Update src/System.Management.Automation/namespaces/FileSystemProvider.cs
GigaScratch Oct 19, 2022
53a65d5
Apply a fix to the change
daxian-dbw May 2, 2023
869cb6c
Minor change to the test
daxian-dbw May 2, 2023
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
37 changes: 16 additions & 21 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 @@ -2485,40 +2485,35 @@ protected override void NewItem(
}

// Junctions cannot have files
if (DirectoryInfoHasChildItems((DirectoryInfo)pathDirInfo))
if (!Force && DirectoryInfoHasChildItems((DirectoryInfo)pathDirInfo))
{
string message = StringUtil.Format(FileSystemProviderStrings.DirectoryNotEmpty, path);
WriteError(new ErrorRecord(new IOException(message), "DirectoryNotEmpty", ErrorCategory.WriteError, path));
return;
}

if (Force)
try
{
try
pathDirInfo.Delete();
}
catch (Exception exception)
{
if ((exception is DirectoryNotFoundException) ||
(exception is UnauthorizedAccessException) ||
(exception is System.Security.SecurityException) ||
(exception is IOException))
{
pathDirInfo.Delete();
WriteError(new ErrorRecord(exception, "NewItemDeleteIOError", ErrorCategory.WriteError, path));
}
catch (Exception exception)
else
{
if ((exception is DirectoryNotFoundException) ||
(exception is UnauthorizedAccessException) ||
(exception is System.Security.SecurityException) ||
(exception is IOException))
{
WriteError(new ErrorRecord(exception, "NewItemDeleteIOError", ErrorCategory.WriteError, path));
}
else
{
throw;
}
throw;
}
}
}
else
{
CreateDirectory(path, false);
pathDirInfo = new DirectoryInfo(path);
}

CreateDirectory(path, streamOutput: false);
pathDirInfo = new DirectoryInfo(path);

try
{
Expand Down
13 changes: 13 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 @@ -550,6 +550,7 @@ Describe "Hard link and symbolic link tests" -Tags "CI", "RequireAdminOnWindows"
$nonFile = Join-Path $TestPath "not-a-file"
$fileContent = "some text"
$realDir = Join-Path $TestPath "subdir"
$realDir2 = Join-Path $TestPath "second-subdir"
$nonDir = Join-Path $TestPath "not-a-dir"
$hardLinkToFile = Join-Path $TestPath "hard-to-file.txt"
$symLinkToFile = Join-Path $TestPath "sym-link-to-file.txt"
Expand All @@ -560,6 +561,7 @@ Describe "Hard link and symbolic link tests" -Tags "CI", "RequireAdminOnWindows"

New-Item -ItemType File -Path $realFile -Value $fileContent > $null
New-Item -ItemType Directory -Path $realDir > $null
New-Item -ItemType Directory -Path $realDir2 > $null
}

Context "New-Item and hard/symbolic links" {
Expand Down Expand Up @@ -628,6 +630,17 @@ Describe "Hard link and symbolic link tests" -Tags "CI", "RequireAdminOnWindows"
$i = New-Item -ItemType File -Path "$TestDrive\file.txt" -Force -ErrorAction Ignore
{ New-Item -ItemType HardLink -Path $i -Target $i -Force -ErrorAction Stop } | Should -Throw -ErrorId "TargetIsSameAsLink,Microsoft.PowerShell.Commands.NewItemCommand"
}

It "New-Item -Force can overwrite a junction" -Skip:(-Not $IsWindows){
$rd2 = Get-Item -Path $realDir2
New-Item -Name testfile.txt -ItemType file -Path $realDir
New-Item -ItemType Junction -Path $junctionToDir -Value $realDir > $null
Test-Path $junctionToDir | Should -BeTrue
{ New-Item -ItemType Junction -Path $junctionToDir -Value $realDir -ErrorAction Stop > $null } | Should -Throw -ErrorId "DirectoryNotEmpty,Microsoft.PowerShell.Commands.NewItemCommand"
New-Item -ItemType Junction -Path $junctionToDir -Value $realDir2 -Force > $null
$Junction = Get-Item -Path $junctionToDir
$Junction.Target | Should -BeExactly $rd2.ToString()
}
}

Context "Get-ChildItem and symbolic links" {
Expand Down