fix: consider readonly files when deleting directories (#863)

* #849 - Implementing directory validation for ReadOnly files when trying to delete directory recursively * Removing unnecessary lock in methods
TestableIO · Jul 15, 2022 · fc2d041 · fc2d041
1 parent ca6a712
commit fc2d041
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/src/System.IO.Abstractions.TestingHelpers/MockFileSystem.cs b/src/System.IO.Abstractions.TestingHelpers/MockFileSystem.cs
@@ -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);
                 }
@@ -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);
                 }
@@ -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);
@@ -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
         {

diff --git a/tests/System.IO.Abstractions.TestingHelpers.Tests/MockFileSystemTests.cs b/tests/System.IO.Abstractions.TestingHelpers.Tests/MockFileSystemTests.cs
@@ -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;