Allow the user to force user gsudo via a SecureSetting (fix #3692)

Author: marticliment

src/UniGetUI.Core.SecureSettings/SecureSettings.cs

@@ -12,6 +12,7 @@ public static class SecureSettings
     public const string ALLOW_IMPORTING_CLI_ARGUMENTS = "AllowImportingCLIArguments";
     public const string ALLOW_PREPOST_OPERATIONS = "AllowPrePostInstallCommands";
     public const string ALLOW_IMPORT_PREPOST_OPERATIONS = "AllowImportingPrePostInstallCommands";
+    public const string FORCE_USER_GSUDO = "ForceUserGSudo";
 
 
     private static readonly Dictionary<string, bool> _cache = new();

src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/Classes/InstallOptionsFactory.cs

@@ -212,11 +212,11 @@ private static InstallOptions EnsureSecureOptions(InstallOptions options)
             {
                 // Otherwhise, clear them
                 if (options.CustomParameters_Install.Count > 0)
-                    Logger.Warn($"Custom CLI parameters [{string.Join(' ', options.CustomParameters_Install)}] will be discarded");
+                    Logger.Warn($"Custom install parameters [{string.Join(' ', options.CustomParameters_Install)}] will be discarded");
                 if (options.CustomParameters_Update.Count > 0)
-                    Logger.Warn($"Custom CLI parameters [{string.Join(' ', options.CustomParameters_Update)}] will be discarded");
+                    Logger.Warn($"Custom update parameters [{string.Join(' ', options.CustomParameters_Update)}] will be discarded");
                 if (options.CustomParameters_Uninstall.Count > 0)
-                    Logger.Warn($"Custom CLI parameters [{string.Join(' ', options.CustomParameters_Uninstall)}] will be discarded");
+                    Logger.Warn($"Custom uninstall parameters [{string.Join(' ', options.CustomParameters_Uninstall)}] will be discarded");
 
                 options.CustomParameters_Install = [];
                 options.CustomParameters_Update = [];

src/UniGetUI.PackageEngine.Serializable/InstallOptions.cs

@@ -83,7 +83,7 @@ private static List<string> ReadArrayFromJson(JsonNode data, string name)
             foreach (var element in data[name]?.AsArray2() ?? [])
                 if (element is not null)
                     result.Add(element.GetVal<string>());
-            return result;
+            return result.Where(x => x.Any()).ToList();
         }
 
         public bool DiffersFromDefault()

src/UniGetUI/App.xaml.cs

@@ -15,6 +15,7 @@
 using UniGetUI.PackageEngine.Classes.Manager.Classes;
 using Microsoft.Windows.AppLifecycle;
 using Microsoft.Windows.AppNotifications;
+using UniGetUI.Core.SettingsEngine.SecureSettings;
 using UniGetUI.Interface.Telemetry;
 using UniGetUI.PackageEngine.Interfaces;
 using LaunchActivatedEventArgs = Microsoft.UI.Xaml.LaunchActivatedEventArgs;
@@ -98,6 +99,17 @@ private static async void LoadGSudo()
             Logger.Warn($"Using bundled GSudo at {CoreData.ElevatorPath} since UniGetUI Elevator is not available!");
             CoreData.ElevatorPath = (await CoreTools.WhichAsync("gsudo.exe")).Item2;
 #else
+            if (SecureSettings.Get(SecureSettings.FORCE_USER_GSUDO))
+            {
+                var res = await CoreTools.WhichAsync("gsudo.exe");
+                if (res.Item1)
+                {
+                    CoreData.ElevatorPath = res.Item2;
+                    Logger.Warn($"Using user GSudo (forced by user) at {CoreData.ElevatorPath}");
+                    return;
+                }
+            }
+
             CoreData.ElevatorPath = Path.Join(CoreData.UniGetUIExecutableDirectory, "Assets", "Utilities", "UniGetUI Elevator.exe");
             Logger.Debug($"Using built-in UniGetUI Elevator at {CoreData.ElevatorPath}");
 #endif

src/UniGetUI/Controls/SettingsWidgets/SecureCheckboxCard.cs

@@ -115,8 +115,8 @@ protected virtual async Task _checkbox_Toggled()
 
                 _loading.Visibility = Visibility.Visible;
                 _checkbox.IsEnabled = false;
-                StateChanged?.Invoke(this, EventArgs.Empty);
                 await SecureSettings.TrySet(setting_name, _checkbox.IsOn ^ IS_INVERTED ^ ForceInversion);
+                StateChanged?.Invoke(this, EventArgs.Empty);
                 _textblock.Opacity = _checkbox.IsOn ? 1 : 0.7;
                 _checkbox.IsOn = SecureSettings.Get(setting_name) ^ IS_INVERTED ^ ForceInversion;
                 _loading.Visibility = Visibility.Collapsed;

src/UniGetUI/Pages/SettingsPages/GeneralPages/Administrator.xaml

@@ -65,16 +65,14 @@
                 Text="Allow custom command-line arguments"
                 WarningText="Custom command-line arguments can change the way in which programs are installed, upgraded or uninstalled, in a way UniGetUI cannot control. Using custom command-lines can break packages. Proceed with caution." />
 
-
-            <!--  The lines below will soon see the light of the sun, but not yet. Please do not modify them  -->
             <!--
                 widgets:SecureCheckboxCard
                 x:Name="AllowPrePostInstallCommands"
                 BorderThickness="1,0,1,1"
                 CornerRadius="0,0,8,8"
                 SettingName="AllowPrePostInstallCommands"
                 Text="Ignore custom pre-install and post-install commands when importing packages from a bundle"
-                WarningText="Pre and post install commands will be run before and after a package gets installed, upgraded or uninstalled. Be aware thay they may break things unless used carefully" /
+                WarningText="Pre and post install commands will be run before and after a package gets installed, upgraded or uninstalled. Be aware that they may break things unless used carefully" /
             -->
 
             <widgets:TranslatedTextBlock
@@ -88,7 +86,7 @@
                 IsEnabled="{x:Bind AllowCLIArguments._checkbox.IsOn, Mode=OneWay}"
                 SettingName="AllowImportingCLIArguments"
                 Text="Allow importing custom command-line arguments when importing packages from a bundle"
-                WarningText="Malformed command-line arguments can break packages, or even gain remote execution. Therefore, importing custom command-line arguments is disabled by default" />
+                WarningText="Malformed command-line arguments can break packages, or even allow a malicious actor to gain privileged execution. Therefore, importing custom command-line arguments is disabled by default" />
 
             <!--
                 widgets:SecureCheckboxCard

src/UniGetUI/Pages/SettingsPages/GeneralPages/Experimental.xaml

@@ -53,21 +53,19 @@
 
             <UserControl Height="16" />
 
-            <widgets:CheckboxCard
+            <!--widgets:CheckboxCard
                 x:Name="DisableUniGetUIElevatorToggle"
                 BorderThickness="1,1,1,0"
                 CornerRadius="8"
                 SettingName="DisableUniGetUIElevator"
                 StateChanged="ShowRestartBanner"
-                Text="Enable the new UniGetUI-Branded UAC Elevator" />
-            <!--
-                widgets:CheckboxCard
+                Text="Enable the new UniGetUI-Branded UAC Elevator" /-->
+            <widgets:SecureCheckboxCard
                 x:Name="UseUserGSudoToggle"
-                CornerRadius="0,0,8,8"
-                SettingName="UseUserGSudo"
+                CornerRadius="8"
+                SettingName="ForceUserGSudo"
                 StateChanged="ShowRestartBanner"
-                Text="Use installed GSudo instead of the bundled one" /
-            -->
+                Text="Use installed GSudo instead of UniGetUI Elevator" />
 
             <UserControl Height="16" />