Skip to content

fix: consider readonly files when deleting directories #863

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
merged 5 commits into from
Jul 15, 2022
Merged

fix: consider readonly files when deleting directories #863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c015301
#849 - Implementing directory validation for ReadOnly files when tryi…
VictorLlanir Jul 3, 2022
9bc097e
Merge branch 'main' into issue/849
VictorLlanir Jul 4, 2022
154b319
Removing unnecessary lock in methods
VictorLlanir Jul 14, 2022
cf92f12
Merge branch 'issue/849' of https://github.com/VictorLlanir/System.IO…
VictorLlanir Jul 14, 2022
0233e52
Merge branch 'main' into issue/849
VictorLlanir Jul 14, 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
15 changes: 12 additions & 3 deletions src/System.IO.Abstractions.TestingHelpers/MockFileSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,7 @@ public void AddDirectory(string path)

lock (files)
{
if (FileExists(fixedPath) &&
(GetFile(fixedPath).Attributes & FileAttributes.ReadOnly) == FileAttributes.ReadOnly)
if (FileExists(fixedPath) && FileIsReadOnly(fixedPath))
{
throw CommonExceptions.AccessDenied(fixedPath);
}
Expand Down Expand Up @@ -302,7 +301,7 @@ public void RemoveFile(string path)

lock (files)
{
if (FileExists(path) && (GetFile(path).Attributes & FileAttributes.ReadOnly) == FileAttributes.ReadOnly)
if (FileExists(path) && (FileIsReadOnly(path) || Directory.Exists(path) && AnyFileIsReadOnly(path)))
{
throw CommonExceptions.AccessDenied(path);
}
Expand Down Expand Up @@ -375,6 +374,11 @@ public IEnumerable<string> AllDirectories
}
}

private bool AnyFileIsReadOnly(string path)
{
return Directory.GetFiles(path).Any(file => FileIsReadOnly(file));
}

private bool IsStartOfAnotherPath(string path)
{
return AllPaths.Any(otherPath => otherPath.StartsWith(path) && otherPath != path);
Expand All @@ -396,6 +400,11 @@ private bool DirectoryExistsWithoutFixingPath(string path)
}
}

private bool FileIsReadOnly(string path)
{
return (GetFile(path).Attributes & FileAttributes.ReadOnly) == FileAttributes.ReadOnly;
}

[Serializable]
private class FileSystemEntry
{
Expand Down
18 changes: 18 additions & 0 deletions tests/System.IO.Abstractions.TestingHelpers.Tests/MockFileSystemTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,24 @@ public void MockFileSystem_FileSystemWatcher_Can_Be_Overridden()
Assert.AreEqual(path, watcher.Path);
}

[Test]
public void MockFileSystem_DeleteDirectoryRecursive_WithReadOnlyFile_ShouldThrowUnauthorizedException()
{
string baseDirectory = XFS.Path(@"C:\Test");
string textFile = XFS.Path(@"C:\Test\file.txt");

var fileSystem = new MockFileSystem();
fileSystem.AddFile(baseDirectory, new MockFileData(string.Empty));
fileSystem.AddFile(textFile, new MockFileData("Content"));
fileSystem.File.SetAttributes(textFile, FileAttributes.ReadOnly);

TestDelegate action = () => fileSystem.Directory.Delete(baseDirectory, true);

Assert.Throws<UnauthorizedAccessException>(action);
Assert.True(fileSystem.File.Exists(textFile));
Assert.True(fileSystem.Directory.Exists(baseDirectory));
}

private class TestFileSystem : MockFileSystem
{
private readonly IFileSystemWatcherFactory fileSystemWatcherFactory;
Expand Down