WinGet packages that are installed system-wide will trigger UAC elevation (fix #3140)

Author: marticliment

src/UniGetUI.PackageEngine.Managers.WinGet/ClientHelpers/NativePackageHandler.cs

@@ -3,14 +3,15 @@
 using UniGetUI.Core.Logging;
 using UniGetUI.PackageEngine.Enums;
 using UniGetUI.PackageEngine.Interfaces;
+using UniGetUI.PackageEngine.PackageClasses;
 
 namespace UniGetUI.PackageEngine.Managers.WingetManager;
 
 public static class NativePackageHandler
 {
     private static readonly ConcurrentDictionary<long, CatalogPackage> __nativePackages = new();
     private static readonly ConcurrentDictionary<long, CatalogPackageMetadata> __nativeDetails = new();
-    private static readonly ConcurrentDictionary<long, PackageInstallerInfo> __nativeInstallers_Install = new();
+    private static ConcurrentDictionary<long, PackageInstallerInfo> __nativeInstallers_Install = new();
     private static ConcurrentDictionary<long, PackageInstallerInfo> __nativeInstallers_Uninstall = new();
 
     /// <summary>
@@ -66,7 +67,7 @@ public static void AddPackage(IPackage package, CatalogPackage catalogPackage)
     /// <summary>
     /// Get (cached or load) the native installer for the given package, if any. The operation type determines wether
     /// </summary>
-    public static PackageInstallerInfo? GetInstallationOptions(IPackage package, OperationType operation)
+    public static PackageInstallerInfo? GetInstallationOptions(IPackage package, IInstallationOptions unigetuiOptions, OperationType operation)
     //    =>  TaskRecycler<PackageInstallerInfo?>.RunOrAttach(_getInstallationOptions, package, operation);
     //
     //private static PackageInstallerInfo? _getInstallationOptions(IPackage package, OperationType operation)
@@ -76,22 +77,23 @@ public static void AddPackage(IPackage package, CatalogPackage catalogPackage)
 
         PackageInstallerInfo? installerInfo;
         if (operation is OperationType.Uninstall)
-            installerInfo = _getInstallationOptionsOnDict(package, ref __nativeInstallers_Uninstall, true);
+            installerInfo = _getInstallationOptionsOnDict(package, ref __nativeInstallers_Uninstall, true, unigetuiOptions);
         else
-            installerInfo = _getInstallationOptionsOnDict(package, ref __nativeInstallers_Uninstall, false);
+            installerInfo = _getInstallationOptionsOnDict(package, ref __nativeInstallers_Install, false, unigetuiOptions);
 
         return installerInfo;
     }
 
     public static void Clear()
     {
-        __nativePackages.Clear();;
-        __nativeDetails.Clear();;
-        __nativeInstallers_Install.Clear();;
+        __nativePackages.Clear();
+        __nativeDetails.Clear();
+        __nativeInstallers_Install.Clear();
         __nativeInstallers_Uninstall.Clear();
     }
 
-    private static PackageInstallerInfo? _getInstallationOptionsOnDict(IPackage package, ref ConcurrentDictionary<long, PackageInstallerInfo> source, bool installed)
+    private static PackageInstallerInfo? _getInstallationOptionsOnDict(IPackage package,
+        ref ConcurrentDictionary<long, PackageInstallerInfo> source, bool installed, IInstallationOptions unigetuiOptions)
     {
         if (source.TryGetValue(package.GetHash(), out PackageInstallerInfo? installerInfo))
             return installerInfo;
@@ -100,8 +102,26 @@ public static void Clear()
         if (installed) catalogPackage = GetPackage(package)?.InstalledVersion;
         else catalogPackage = GetPackage(package)?.DefaultInstallVersion;
 
-        InstallOptions? options = NativeWinGetHelper.ExternalFactory?.CreateInstallOptions();
-        installerInfo = catalogPackage?.GetApplicableInstaller(options);
+        InstallOptions? wingetOptions = NativeWinGetHelper.ExternalFactory?.CreateInstallOptions();
+        InstallOptions? wingetDefaultOptions = NativeWinGetHelper.ExternalFactory?.CreateInstallOptions();
+
+        if (wingetOptions is null)
+        {
+            Logger.Error("WinGetFactory.CreateInstallOptions returned null!");
+            return installerInfo;
+        }
+
+        if (unigetuiOptions.InstallationScope is PackageScope.Machine)
+        {
+            wingetOptions.PackageInstallScope = PackageInstallScope.System;
+        }
+        else if (unigetuiOptions.InstallationScope is PackageScope.User)
+        {
+            wingetOptions.PackageInstallScope = PackageInstallScope.User;
+        }
+
+        installerInfo = catalogPackage?.GetApplicableInstaller(wingetOptions);
+        installerInfo ??= catalogPackage?.GetApplicableInstaller(wingetDefaultOptions);
 
         if (installerInfo is not null)
             source[package.GetHash()] = installerInfo;

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

@@ -89,10 +89,10 @@ protected override IEnumerable<string> _getOperationParameters(IPackage package,
 
         try
         {
-            var installOptions = NativePackageHandler.GetInstallationOptions(package, operation);
-            if (installOptions?.ElevationRequirement is ElevationRequirement.ElevationRequired
-                or ElevationRequirement.ElevatesSelf)
+            var installOptions = NativePackageHandler.GetInstallationOptions(package, options, operation);
+            if (installOptions?.ElevationRequirement is ElevationRequirement.ElevationRequired or ElevationRequirement.ElevatesSelf)
             {
+                Logger.Info("Package requires elevation, forcing administrator rights...");
                 package.OverridenOptions.RunAsAdministrator = true;
             }
             else if (installOptions?.ElevationRequirement is ElevationRequirement.ElevationProhibited)
@@ -106,11 +106,19 @@ protected override IEnumerable<string> _getOperationParameters(IPackage package,
                     throw new UnauthorizedAccessException(
                         CoreTools.Translate("This package cannot be installed from an elevated context.")
                         + CoreTools.Translate("Please check the installation options for this package and try again"));
+
                 package.OverridenOptions.RunAsAdministrator = false;
             }
+            else if(installOptions?.Scope is PackageInstallerScope.System/* or PackageInstallerScope.Unknown*/)
+            {
+                Logger.Info("Package is installed on a system-wide scope, forcing administrator rights...");
+                package.OverridenOptions.RunAsAdministrator = true;
+            }
         }
         catch (Exception ex)
         {
+            if (ex is UnauthorizedAccessException) throw;
+
             Logger.Error("Recovered from fatal WinGet exception:");
             Logger.Error(ex);
         }