[FlashpointManager] Improve security of I/O operations

Author: WumboSpasm

FlashpointManager/src/Common.cs

@@ -449,7 +449,24 @@ public static void SyncManager(bool init = false)
             // Deletes a file as well as any directories made empty by its deletion
             public static void DeleteFileAndDirectories(string file)
             {
-                try { File.Delete(file); } catch { }
+                file = Path.GetFullPath(file);
+
+                if (!Path.GetFullPath(file).StartsWith(Path.GetFullPath(SourcePath))) return;
+
+                try
+                {
+                    File.Delete(file);
+                }
+                catch (Exception e) when (!(e is DirectoryNotFoundException))
+                {
+                    MessageBox.Show(
+                        "Failed to delete the following file:\n" + file + "\n\n" +
+                        "Make sure it is not open or being used by another program.",
+                        "Error", MessageBoxButtons.OK, MessageBoxIcon.Error
+                    );
+
+                    return;
+                }
 
                 string folder = Path.GetDirectoryName(file);
 

FlashpointManager/src/Forms/Operate.cs

@@ -130,8 +130,6 @@ private async void Operation_Load(object sender, EventArgs e)
                 await Task.Run(ApplyComponents);
             }
 
-            await Task.Run(DeleteTempDirectory);
-
             TaskbarManager.Instance.SetProgressState(TaskbarProgressBarState.NoProgress, FPM.Main.Handle);
 
             if (FPM.AutoDownload.Count == 0) FPM.SyncManager();
@@ -292,6 +290,23 @@ private void RemoveComponents()
 
         private void ApplyComponents()
         {
+            void MoveDelete(string source, string dest)
+            {
+                try
+                {
+                    File.Move(source, dest);
+                    FPM.DeleteFileAndDirectories(source);
+                }
+                catch
+                {
+                    MessageBox.Show(
+                        "Failed to move the following file:\n" + source + "\n\n" +
+                        "You will have to move it manually from the Temp folder.",
+                        "Error", MessageBoxButtons.OK, MessageBoxIcon.Error
+                    );
+                }
+            }
+
             string tempPath = Path.Combine(FPM.SourcePath, "Temp");
             string tempInfoFile = Path.Combine(tempPath, "Components", workingComponent.ID);
             string[] infoText = File.ReadLines(tempInfoFile).Skip(1).ToArray();
@@ -302,25 +317,11 @@ private void ApplyComponents()
                 string destFile = Path.Combine(FPM.SourcePath, file);
 
                 Directory.CreateDirectory(Path.GetDirectoryName(destFile));
-                try { File.Move(tempFile, destFile); } catch { }
-            }
-
-            try { File.Move(tempInfoFile, workingComponent.InfoFile); } catch { }
-        }
-
-        public static void DeleteTempDirectory()
-        {
-            string tempPath = Path.Combine(FPM.SourcePath, "Temp");
 
-            if (Directory.Exists(tempPath))
-            {
-                foreach (string tempFile in Directory.EnumerateFiles(tempPath))
-                {
-                    try { File.Delete(tempFile); } catch { }
-                }
-
-                try { Directory.Delete(tempPath, true); } catch { }
+                MoveDelete(tempFile, destFile);
             }
+
+            MoveDelete(tempInfoFile, workingComponent.InfoFile);
         }
 
         private async void CancelButton_Click(object sender, EventArgs e)
@@ -337,7 +338,17 @@ await Task.Run(() =>
             {
                 while (cancelStatus != 2) { }
 
-                DeleteTempDirectory();
+                string tempPath = Path.Combine(FPM.SourcePath, "Temp");
+
+                if (Directory.Exists(tempPath))
+                {
+                    foreach (string tempFile in Directory.EnumerateFiles(tempPath))
+                    {
+                        try { File.Delete(tempFile); } catch { }
+                    }
+
+                    try { Directory.Delete(tempPath, true); } catch { }
+                }
             });
 
             TaskbarManager.Instance.SetProgressState(TaskbarProgressBarState.NoProgress, FPM.Main.Handle);