Skip to content

Fix FileSystemProvider to not treat all reparsepoints as files #14860

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 4 commits into from
Closed

Fix FileSystemProvider to not treat all reparsepoints as files #14860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
31da985
Fix FileSystemProvider to not treat all reparsepoints as files
SteveL-MSFT Feb 20, 2021
491519a
Fix logic so that a reparsepoint directory where -recurse is not spec…
SteveL-MSFT Feb 20, 2021
e413e2c
Add more comments addressing Ilya's feedback
SteveL-MSFT Feb 22, 2021
3920394
Address Committee feedback making this an ExperimentalFeature and req…
SteveL-MSFT Feb 23, 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
13 changes: 11 additions & 2 deletions src/Microsoft.PowerShell.Commands.Management/commands/management/Navigation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2693,13 +2693,22 @@ protected override void ProcessRecord()
bool shouldRecurse = Recurse;
bool treatAsFile = false;

// only check if path is a directory using DirectoryInfo if using FileSystemProvider
// only check if path is a directory using DirectoryInfo if using FileSystemProvider, otherwise will fail for other providers like Registry
if (resolvedPath.Provider.Name.Equals(FileSystemProvider.ProviderName, StringComparison.OrdinalIgnoreCase))
{
try
{
System.IO.DirectoryInfo di = new(providerPath);
if (di != null && (di.Attributes & System.IO.FileAttributes.ReparsePoint) != 0)

if (ExperimentalFeature.IsEnabled(ExperimentalFeature.PSForceRemoveReparsePoint))
{
if (di != null && di.Attributes.HasFlag(System.IO.FileAttributes.ReparsePoint) && (di.Attributes.HasFlag(System.IO.FileAttributes.Directory) && !shouldRecurse))
{
shouldRecurse = false;
treatAsFile = true;
}
}
else if (di != null && (di.Attributes & System.IO.FileAttributes.ReparsePoint) != 0)
{
shouldRecurse = false;
treatAsFile = true;
Expand Down
4 changes: 4 additions & 0 deletions src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ public class ExperimentalFeature

internal const string EngineSource = "PSEngine";
internal const string PSAnsiProgressFeatureName = "PSAnsiProgress";
internal const string PSForceRemoveReparsePoint = "PSForceRemoveReparsePoint";

#endregion

Expand Down Expand Up @@ -136,6 +137,9 @@ static ExperimentalFeature()
new ExperimentalFeature(
name: PSAnsiProgressFeatureName,
description: "Enable lightweight progress bar that leverages ANSI codes for rendering"),
new ExperimentalFeature(
name: PSForceRemoveReparsePoint,
description: "Enable -Force to remove reparsepoint folders like on OneDrive"),
};
EngineExperimentalFeatures = new ReadOnlyCollection<ExperimentalFeature>(engineFeatures);

Expand Down
18 changes: 12 additions & 6 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 @@ -3108,12 +3108,18 @@ private void RemoveDirectoryInfoItem(DirectoryInfo directory, bool recurse, bool
{
try
{
// TODO:
// Different symlinks seem to vary by behavior.
// In particular, OneDrive symlinks won't remove without recurse,
// but the .NET API here does not allow us to distinguish them.
// We may need to revisit using p/Invokes here to get the right behavior
directory.Delete();
if (force && ExperimentalFeature.IsEnabled(ExperimentalFeature.PSForceRemoveReparsePoint))
{
// For non-reparse points, the behavior is to manually recurse so if `-Confirm` is used, then the user
// gets a confirmation at each level. Unfortunately, a reparse point behaves differently and requires
// the `Delete(recursive)` overload to successfully delete the folder (like a OneDrive folder).
// Symlinks are still treated as files.
directory.Delete(recursive: recurse);
}
else
{
directory.Delete();
}
}
catch (Exception e)
{
Expand Down