Merge pull request #90 from synhershko/ianwall-fix-file-permissions

Copy original file permissions to updated file. (modified)
synhershko · Nov 13, 2016 · ba99ee2 · ba99ee2
2 parents 5765df5 + bae5c6f
commit ba99ee2
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/src/NAppUpdate.Framework/Tasks/FileUpdateTask.cs b/src/NAppUpdate.Framework/Tasks/FileUpdateTask.cs
@@ -1,5 +1,7 @@
-using System;
+using System;
 using System.IO;
+using System.Security.AccessControl;
+using System.Security.Principal;
 using System.Threading;
 using NAppUpdate.Framework.Common;
 using NAppUpdate.Framework.Utils;
@@ -116,7 +118,9 @@ public override TaskExecutionStatus Execute(bool coldRun)
 				try
 				{
 					if (File.Exists(_destinationFile))
-					{
+					{
+						FileSystem.CopyAccessControl(new FileInfo(_destinationFile), new FileInfo(_tempFile));
+
 						File.Delete(_destinationFile);
 					}
 
@@ -146,7 +150,8 @@ public override TaskExecutionStatus Execute(bool coldRun)
 				return TaskExecutionStatus.RequiresPrivilegedAppRestart;
 			}
 			return TaskExecutionStatus.RequiresAppRestart;
-		}
+		}
+
 
 		public override bool Rollback()
 		{

diff --git a/src/NAppUpdate.Framework/Utils/FileSystem.cs b/src/NAppUpdate.Framework/Utils/FileSystem.cs
@@ -2,7 +2,9 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-
+using System.Security.AccessControl;
+using System.Security.Principal;
+
 namespace NAppUpdate.Framework.Utils
 {
 	public static class FileSystem
@@ -95,6 +97,23 @@ public static bool IsFileLocked(FileInfo file)
 
 			//file is not locked
 			return false;
+		}
+
+		public static void CopyAccessControl(FileInfo src, FileInfo dst)
+		{
+			FileSecurity fs = src.GetAccessControl();
+
+			bool hasInheritanceRules = fs.GetAccessRules(false, true, typeof(SecurityIdentifier)).Count > 0;
+			if (hasInheritanceRules)
+			{
+				fs.SetAccessRuleProtection(false, false);
+			}
+			else
+			{
+				fs.SetAccessRuleProtection(true, true);
+			}
+
+			dst.SetAccessControl(fs);
 		}
 	}
 }