(chocolatey#770) Update arguments service behavior

This commit updates the behavior used when parsing package arguments to use the same logic as Chocolatey itself when it is parsing persisted upgrade arguments.
steviecoaster · Jan 20, 2022 · b6887a1 · b6887a1
1 parent e2c2756
commit b6887a1
Show file tree

Hide file tree

Showing 4 changed files with 239 additions and 187 deletions.
diff --git a/Source/ChocolateyGui.Common.Windows/Services/IPackageArgumentsService.cs b/Source/ChocolateyGui.Common.Windows/Services/IPackageArgumentsService.cs
@@ -5,10 +5,12 @@
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
+using System.Collections.Generic;
+
 namespace ChocolateyGui.Common.Windows.Services
 {
     public interface IPackageArgumentsService
     {
-        string DecryptPackageArgumentsFile(string id, string version);
+        IEnumerable<string> DecryptPackageArgumentsFile(string id, string version);
     }
 }
diff --git a/Source/ChocolateyGui.Common.Windows/Services/PackageArgumentsService.cs b/Source/ChocolateyGui.Common.Windows/Services/PackageArgumentsService.cs
@@ -6,8 +6,10 @@
 // --------------------------------------------------------------------------------------------------------------------
 
 using System;
+using System.Collections.Generic;
 using chocolatey;
 using chocolatey.infrastructure.adapters;
+using chocolatey.infrastructure.app.utility;
 using ChocolateyGui.Common.Properties;
 using ChocolateyGui.Common.Providers;
 using IFileSystem = chocolatey.infrastructure.filesystem.IFileSystem;
@@ -21,34 +23,79 @@ public class PackageArgumentsService : IPackageArgumentsService
         private readonly IEncryptionUtility _encryptionUtility;
         private readonly IFileSystem _fileSystem;
         private readonly IChocolateyConfigurationProvider _chocolateyConfigurationProvider;
+        private readonly IDialogService _dialogService;
 
-        public PackageArgumentsService(IEncryptionUtility encryptionUtility, IFileSystem fileSystem, IChocolateyConfigurationProvider chocolateyConfigurationProvider)
+        public PackageArgumentsService(
+            IEncryptionUtility encryptionUtility,
+            IFileSystem fileSystem,
+            IChocolateyConfigurationProvider chocolateyConfigurationProvider,
+            IDialogService dialogService)
         {
             _encryptionUtility = encryptionUtility;
             _fileSystem = fileSystem;
             _chocolateyConfigurationProvider = chocolateyConfigurationProvider;
+            _dialogService = dialogService;
         }
 
-        public string DecryptPackageArgumentsFile(string id, string version)
+        public IEnumerable<string> DecryptPackageArgumentsFile(string id, string version)
         {
             var argumentsPath = _fileSystem.combine_paths(_chocolateyConfigurationProvider.ChocolateyInstall, ".chocolatey", "{0}.{1}".format_with(id, version));
             var argumentsFile = _fileSystem.combine_paths(argumentsPath, ".arguments");
 
+            string arguments = string.Empty;
+
             // Get the arguments decrypted in here and return them
             try
             {
                 if (_fileSystem.file_exists(argumentsFile))
                 {
-                    return _encryptionUtility.decrypt_string(_fileSystem.read_file(argumentsFile));
+                    arguments = _fileSystem.read_file(argumentsFile);
                 }
-
-                return Resources.PackageView_UnableToFindArgumentsFile.format_with(version, id);
             }
             catch (Exception ex)
             {
                 var message = Resources.Application_PackageArgumentsError.format_with(version, id);
                 Logger.Error(ex, message);
-                return message;
+            }
+
+            if (string.IsNullOrEmpty(arguments))
+            {
+                _dialogService.ShowMessageAsync(
+                    string.Empty,
+                    Resources.PackageView_UnableToFindArgumentsFile.format_with(version, id));
+                yield break;
+            }
+
+            // The following code is borrowed from the Chocolatey codebase, should
+            // be extracted to a separate location in choco executable so we can re-use it.
+            var packageArgumentsUnencrypted = arguments.contains(" --") && arguments.to_string().Length > 4
+                ? arguments
+                : _encryptionUtility.decrypt_string(arguments);
+
+            var sensitiveArgs = ArgumentsUtility.arguments_contain_sensitive_information(packageArgumentsUnencrypted);
+
+            var packageArgumentsSplit =
+                packageArgumentsUnencrypted.Split(new[] { " --" }, StringSplitOptions.RemoveEmptyEntries);
+
+            foreach (var packageArgument in packageArgumentsSplit.or_empty_list_if_null())
+            {
+                var packageArgumentSplit =
+                    packageArgument.Split(new[] { '=' }, 2, StringSplitOptions.RemoveEmptyEntries);
+                var optionName = packageArgumentSplit[0].to_string();
+                var optionValue = string.Empty;
+
+                if (packageArgumentSplit.Length == 2)
+                {
+                    optionValue = packageArgumentSplit[1].to_string().remove_surrounding_quotes();
+                    if (optionValue.StartsWith("'"))
+                    {
+                        optionValue.remove_surrounding_quotes();
+                    }
+                }
+
+                yield return "--{0}{1}".format_with(
+                    optionName,
+                    string.IsNullOrWhiteSpace(optionValue) ? string.Empty : "=" + optionValue);
             }
         }
     }