From 17f134cbda700efb0b404fd194786c7f3c2bdaf3 Mon Sep 17 00:00:00 2001
From: froce <fwesen2@gmail.com>
Date: Wed, 18 May 2022 16:14:45 +0200
Subject: [PATCH] Apply FileSystemRights recursively

---
 DW2Net6Win/Isolation/Windows.cs | 43 +++++++++++++++++++++++++++++++--
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/DW2Net6Win/Isolation/Windows.cs b/DW2Net6Win/Isolation/Windows.cs
index ce99e3c..8826c5e 100644
--- a/DW2Net6Win/Isolation/Windows.cs
+++ b/DW2Net6Win/Isolation/Windows.cs
@@ -234,12 +234,51 @@ private static void AllowFileAccess(AppContainerProfile container, string path,
                 }
             }
 
-            foreach (var file in Directory.EnumerateFiles(path, "*", SearchOption.TopDirectoryOnly))
+            foreach (var directory in Directory.EnumerateDirectories(path, "*", SearchOption.AllDirectories))
+            {
+                var di = new DirectoryInfo(directory);
+                var fs = di.GetAccessControl(AccessControlSections.Access);
+                if (!fs.AreAccessRulesProtected) continue;
+
+                var existing2 = fs.GetAccessRules(true, false, typeof(SecurityIdentifier))
+                    .Cast<FileSystemAccessRule>()
+                    .ToArray();
+                foreach (var rule in existing2)
+                {
+                    if (rule.FileSystemRights == dirRights && rule.IdentityReference == sid)
+                    {
+                        fs.RemoveAccessRule(rule);
+                    }
+                }
+
+                fs.SetAccessRuleProtection(false, false);
+                try
+                {
+                    di.SetAccessControl(fs);
+                }
+                catch (Exception ex)
+                {
+                    throw new SecurityException($"Unable to apply AppContainer restrictions to {directory}", ex);
+                }
+            }
+
+            foreach (var file in Directory.EnumerateFiles(path, "*", SearchOption.AllDirectories))
             {
                 var fi = new FileInfo(file);
                 var fs = fi.GetAccessControl(AccessControlSections.Access);
                 if (!fs.AreAccessRulesProtected) continue;
-                fs.PurgeAccessRules(sid);
+
+                var existing2 = fs.GetAccessRules(true, false, typeof(SecurityIdentifier))
+                    .Cast<FileSystemAccessRule>()
+                    .ToArray();
+                foreach (var rule in existing2)
+                {
+                    if(rule.FileSystemRights == dirRights && rule.IdentityReference == sid)
+                    {
+                        fs.RemoveAccessRule(rule);
+                    }
+                }
+
                 fs.SetAccessRuleProtection(false, false);
                 try
                 {