Improvements to how Admin rights are handled on operations (prevent issues like #3391 from ever happening again)

Author: marticliment

src/UniGetUI.PackageEngine.Enums/OverridenInstallationOptions.cs

@@ -13,4 +13,9 @@ public OverridenInstallationOptions(PackageScope? scope = null, bool? runAsAdmin
         Scope = scope;
         RunAsAdministrator = runAsAdministrator;
     }
+
+    public override string ToString()
+    {
+        return $"<Scope={Scope};RunAsAdministrator={RunAsAdministrator};WG_SpecifyVersion={WinGet_SpecifyVersion};PS_NoScope={PowerShell_DoNotSetScopeParameter}>";
+    }
 }

src/UniGetUI.PackageEngine.Managers.WinGet/Helpers/WinGetPkgOperationHelper.cs

@@ -92,7 +92,7 @@ protected override IReadOnlyList<string> _getOperationParameters(IPackage packag
             var installOptions = NativePackageHandler.GetInstallationOptions(package, options, operation);
             if (installOptions?.ElevationRequirement is ElevationRequirement.ElevationRequired or ElevationRequirement.ElevatesSelf)
             {
-                Logger.Info("Package requires elevation, forcing administrator rights...");
+                Logger.Info($"WinGet package {package.Id} requires elevation, forcing administrator rights...");
                 package.OverridenOptions.RunAsAdministrator = true;
             }
             else if (installOptions?.ElevationRequirement is ElevationRequirement.ElevationProhibited)
@@ -111,7 +111,7 @@ protected override IReadOnlyList<string> _getOperationParameters(IPackage packag
             }
             else if(installOptions?.Scope is PackageInstallerScope.System/* or PackageInstallerScope.Unknown*/)
             {
-                Logger.Info("Package is installed on a system-wide scope, forcing administrator rights...");
+                Logger.Info($"WinGet package {package.Id} is installed on a system-wide scope, forcing administrator rights...");
                 package.OverridenOptions.RunAsAdministrator = true;
             }
         }

src/UniGetUI.PackageEngine.Operations/PackageOperations.cs

@@ -78,45 +78,44 @@ protected override void ApplyRetryAction(string retryMode)
                     throw new InvalidOperationException($"Retry mode {retryMode} is not supported in this context");
             }
             Metadata.OperationInformation = "Retried package operation for Package=" + Package.Id + " with Manager=" +
-                                            Package.Manager.Name + "\nUpdated installation options: " + Options.ToString();
+                                            Package.Manager.Name + "\nUpdated installation options: " + Options.ToString()
+                                            + "\nOverriden options: " + Package.OverridenOptions.ToString();
         }
 
         protected sealed override void PrepareProcessStartInfo()
         {
-            bool admin = CoreTools.IsAdministrator();
+            bool IsAdmin = CoreTools.IsAdministrator();
             Package.SetTag(PackageTag.OnQueue);
             string operation_args = string.Join(" ", Package.Manager.OperationHelper.GetParameters(Package, Options, Role));
+            string FileName, Arguments;
 
-            if (RequiresAdminRights())
+            if (RequiresAdminRights() && IsAdmin is false)
             {
-                admin = true;
+                IsAdmin = true;
                 if (Settings.Get("DoCacheAdminRights") || Settings.Get("DoCacheAdminRightsForBatches"))
                 {
                     RequestCachingOfUACPrompt();
                 }
 
-                if (Package.Manager is WinGet)
-                {
-                    RedirectWinGetTempFolder();
-                }
-
-                process.StartInfo.FileName = CoreData.ElevatorPath;
-                process.StartInfo.Arguments = $"\"{Package.Manager.Status.ExecutablePath}\" {Package.Manager.Properties.ExecutableCallArgs} {operation_args}";
+                FileName = CoreData.ElevatorPath;
+                Arguments = $"\"{Package.Manager.Status.ExecutablePath}\" {Package.Manager.Properties.ExecutableCallArgs} {operation_args}";
             }
-            else if (CoreTools.IsAdministrator() && Package.Manager is WinGet)
+            else
             {
-                RedirectWinGetTempFolder();
-                process.StartInfo.FileName = Package.Manager.Status.ExecutablePath;
-                process.StartInfo.Arguments = $"{Package.Manager.Properties.ExecutableCallArgs} {operation_args}";
+                FileName = Package.Manager.Status.ExecutablePath;
+                Arguments = $"{Package.Manager.Properties.ExecutableCallArgs} {operation_args}";
             }
-            else
+
+            if (IsAdmin && Package.Manager is WinGet)
             {
-                process.StartInfo.FileName = Package.Manager.Status.ExecutablePath;
-                process.StartInfo.Arguments = $"{Package.Manager.Properties.ExecutableCallArgs} {operation_args}";
+                RedirectWinGetTempFolder();
             }
 
+            process.StartInfo.FileName = FileName;
+            process.StartInfo.Arguments = Arguments;
+
             ApplyCapabilities(
-                admin,
+                IsAdmin,
                 Options.InteractiveInstallation,
                 (Options.SkipHashCheck && Role is not OperationType.Uninstall),
                 Package.OverridenOptions.Scope ?? Options.InstallationScope
@@ -165,8 +164,9 @@ protected override Task HandleSuccess()
 
         protected override void Initialize()
         {
-            Metadata.OperationInformation = "Package install operation for Package=" + Package.Id + " with Manager=" +
-                                            Package.Manager.Name + "\nInstallation options: " + Options.ToString();
+            Metadata.OperationInformation = "Package install operation for Package=" + Package.Id + " with Manager="
+                                            + Package.Manager.Name + "\nInstallation options: " + Options.ToString()
+                                            + "\nOverriden options: " + Package.OverridenOptions.ToString();
 
             Metadata.Title = CoreTools.Translate("{package} Installation", new Dictionary<string, object?> { { "package", Package.Name } });
             Metadata.Status = CoreTools.Translate("{0} is being installed", Package.Name);
@@ -219,7 +219,8 @@ protected override async Task HandleSuccess()
         protected override void Initialize()
         {
             Metadata.OperationInformation = "Package update operation for Package=" + Package.Id + " with Manager=" +
-                                            Package.Manager.Name + "\nInstallation options: " + Options.ToString();
+                                            Package.Manager.Name + "\nInstallation options: " + Options.ToString()
+                                            + "\nOverriden options: " + Package.OverridenOptions.ToString();
 
             Metadata.Title = CoreTools.Translate("{package} Update", new Dictionary<string, object?> { { "package", Package.Name } });
             Metadata.Status = CoreTools.Translate("{0} is being updated to version {1}", Package.Name, Package.NewVersionString);
@@ -265,7 +266,8 @@ protected override Task HandleSuccess()
         protected override void Initialize()
         {
             Metadata.OperationInformation = "Package uninstall operation for Package=" + Package.Id + " with Manager=" +
-                                            Package.Manager.Name + "\nInstallation options: " + Options.ToString();
+                                            Package.Manager.Name + "\nInstallation options: " + Options.ToString()
+                                            + "\nOverriden options: " + Package.OverridenOptions.ToString();
 
             Metadata.Title = CoreTools.Translate("{package} Uninstall", new Dictionary<string, object?> { { "package", Package.Name } });
             Metadata.Status = CoreTools.Translate("{0} is being uninstalled", Package.Name);