haeaeae/duplicati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up if block

Browse Source
This commit is contained in:
drwtsn32x
2019-12-26 07:51:30 -08:00
parent 9bca37f29f
commit aa7d4150b3
1 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati/Library/Common/IO/SystemIOWindows.cs
+34 -31
View File
@@ -509,44 +509,47 @@ namespace Duplicati.Library.Common.IO
var targetpath = isDirTarget ? path.Substring(0, path.Length - 1) : path;
FileSystemSecurity rules = isDirTarget ? GetAccessControlDir(targetpath) : GetAccessControlFile(targetpath);
if (restorePermissions && data.ContainsKey("win-ext:accessrulesprotected"))
if (restorePermissions)
{
var content = DeserializeObject<FileSystemAccessProtected>(data["win-ext:accessrulesprotected"]);
if (rules.AreAccessRulesProtected != content.IsProtected)
if (data.ContainsKey("win-ext:accessrulesprotected"))
{
rules.SetAccessRuleProtection(content.IsProtected, false);
}
}
if (restorePermissions && data.ContainsKey("win-ext:accessrules"))
{
var content = DeserializeObject<FileSystemAccess[]>(data["win-ext:accessrules"]);
var c = rules.GetAccessRules(true, false, typeof(System.Security.Principal.SecurityIdentifier));
for (var i = c.Count - 1; i >= 0; i--)
rules.RemoveAccessRule((System.Security.AccessControl.FileSystemAccessRule)c[i]);
Exception ex = null;
foreach (var r in content)
{
// Attempt to apply as many rules as we can
try
var content = DeserializeObject<FileSystemAccessProtected>(data["win-ext:accessrulesprotected"]);
if (rules.AreAccessRulesProtected != content.IsProtected)
{
rules.AddAccessRule(r.Create(rules));
}
catch (Exception e)
{
ex = e;
rules.SetAccessRuleProtection(content.IsProtected, false);
}
}
if (ex != null)
throw ex;
if (data.ContainsKey("win-ext:accessrules"))
{
var content = DeserializeObject<FileSystemAccess[]>(data["win-ext:accessrules"]);
var c = rules.GetAccessRules(true, false, typeof(System.Security.Principal.SecurityIdentifier));
for (var i = c.Count - 1; i >= 0; i--)
rules.RemoveAccessRule((System.Security.AccessControl.FileSystemAccessRule)c[i]);
if (isDirTarget)
SetAccessControlDir(targetpath, (DirectorySecurity)rules);
else
SetAccessControlFile(targetpath, (FileSecurity)rules);
Exception ex = null;
foreach (var r in content)
{
// Attempt to apply as many rules as we can
try
{
rules.AddAccessRule(r.Create(rules));
}
catch (Exception e)
{
ex = e;
}
}
if (ex != null)
throw ex;
if (isDirTarget)
SetAccessControlDir(targetpath, (DirectorySecurity)rules);
else
SetAccessControlFile(targetpath, (FileSecurity)rules);
}
}
}