dotnet-script · filipw · Aug 18, 2021 · Aug 17, 2021 · Aug 17, 2021 · Aug 17, 2021
diff --git a/src/Dotnet.Script.DependencyModel/Context/DotnetRestorer.cs b/src/Dotnet.Script.DependencyModel/Context/DotnetRestorer.cs
@@ -1,4 +1,5 @@
 using Dotnet.Script.DependencyModel.Environment;
+using Dotnet.Script.DependencyModel.Internal;
 using Dotnet.Script.DependencyModel.Logging;
 using Dotnet.Script.DependencyModel.Process;
 using Dotnet.Script.DependencyModel.ProjectSystem;
@@ -44,7 +45,7 @@ string CreatePackageSourcesArguments()
             {
                 return packageSources.Length == 0
                     ? string.Empty
-                    : packageSources.Select(s => $"-s {s}")
+                    : packageSources.Select(s => $"-s {CommandLine.EscapeArgument(s)}")
                         .Aggregate((current, next) => $"{current} {next}");
             }
 

diff --git a/src/Dotnet.Script.DependencyModel/Internal/CommandLine.cs b/src/Dotnet.Script.DependencyModel/Internal/CommandLine.cs
@@ -0,0 +1,93 @@
+using System;
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace Dotnet.Script.DependencyModel.Internal
+{
+    /// <summary>
+    /// <para>
+    /// Performs operations on <see cref="System.String"/> instances that contain command line information.
+    /// </para>
+    /// <para>
+    /// Tip: a ready-to-use package with this functionality is available at https://www.nuget.org/packages/Gapotchenko.FX.Diagnostics.CommandLine.
+    /// </para>
+    /// </summary>
+    /// <summary>
+    /// Available
+    /// </summary>
+    static class CommandLine
+    {
+        /// <summary>
+        /// Escapes and optionally quotes a command line argument.
+        /// </summary>
+        /// <param name="value">The command line argument.</param>
+        /// <returns>The escaped and optionally quoted command line argument.</returns>
+        public static string EscapeArgument(string value)
+        {
+            if (value == null)
+                return null;
+
+            int length = value.Length;
+            if (length == 0)
+                return string.Empty;
+
+            var sb = new StringBuilder();
+            Escape.AppendQuotedText(sb, value);
+
+            if (sb.Length == length)
+                return value;
+
+            return sb.ToString();
+        }
+
+        static class Escape
+        {
+            public static void AppendQuotedText(StringBuilder sb, string text)
+            {
+                bool quotingRequired = IsQuotingRequired(text);
+                if (quotingRequired)
+                    sb.Append('"');
+
+                int numberOfQuotes = 0;
+                for (int i = 0; i < text.Length; i++)
+                {
+                    if (text[i] == '"')
+                        numberOfQuotes++;
+                }
+
+                if (numberOfQuotes > 0)
+                {
+                    if ((numberOfQuotes % 2) != 0)
+                        throw new Exception("Command line parameter cannot contain an odd number of double quotes.");
+                    text = text.Replace("\\\"", "\\\\\"").Replace("\"", "\\\"");
+                }
+
+                sb.Append(text);
+
+                if (quotingRequired && text.EndsWith("\\"))
+                    sb.Append('\\');
+
+                if (quotingRequired)
+                    sb.Append('"');
+            }
+
+            static bool IsQuotingRequired(string parameter) =>
+                !AllowedUnquotedRegex.IsMatch(parameter) ||
+                DefinitelyNeedQuotesRegex.IsMatch(parameter);
+
+            static Regex m_CachedAllowedUnquotedRegex;
+
+            static Regex AllowedUnquotedRegex =>
+                m_CachedAllowedUnquotedRegex ??= new Regex(
+                    @"^[a-z\\/:0-9\._\-+=]*$",
+                    RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
+
+            static Regex m_CachedDefinitelyNeedQuotesRegex;
+
+            static Regex DefinitelyNeedQuotesRegex =>
+                m_CachedDefinitelyNeedQuotesRegex ??= new Regex(
+                    "[|><\\s,;\"]+",
+                    RegexOptions.CultureInvariant);
+        }
+    }
+}
diff --git a/src/Dotnet.Script.Tests/PackageSourceTests.cs b/src/Dotnet.Script.Tests/PackageSourceTests.cs
@@ -17,7 +17,7 @@ public void ShouldHandleSpecifyingPackageSource()
         {
             var fixture = "ScriptPackage/WithNoNuGetConfig";
             var pathToScriptPackages = ScriptPackagesFixture.GetPathToPackagesFolder();
-            var result = ScriptTestRunner.Default.ExecuteFixture(fixture, $"--no-cache -s {pathToScriptPackages}");
+            var result = ScriptTestRunner.Default.ExecuteFixture(fixture, $"--no-cache -s \"{pathToScriptPackages}\"");
             Assert.Contains("Hello", result.output);
             Assert.Equal(0, result.exitCode);
         }
@@ -27,7 +27,7 @@ public void ShouldHandleSpecifyingPackageSourceWhenEvaluatingCode()
         {
             var pathToScriptPackages = ScriptPackagesFixture.GetPathToPackagesFolder();
             var code = @"#load \""nuget:ScriptPackageWithMainCsx,1.0.0\"" SayHello();";
-            var result = ScriptTestRunner.Default.Execute($"--no-cache -s {pathToScriptPackages} eval \"{code}\"");
+            var result = ScriptTestRunner.Default.Execute($"--no-cache -s \"{pathToScriptPackages}\" eval \"{code}\"");
             Assert.Contains("Hello", result.output);
             Assert.Equal(0, result.exitCode);
         }

diff --git a/src/Dotnet.Script.Tests/ScriptExecutionTests.cs b/src/Dotnet.Script.Tests/ScriptExecutionTests.cs
@@ -139,7 +139,7 @@ public void ShouldHandleIssue181()
         [Fact]
         public void ShouldHandleIssue189()
         {
-            var result = ScriptTestRunner.Default.Execute(Path.Combine(TestPathUtils.GetPathToTestFixtureFolder("Issue189"), "SomeFolder", "Script.csx"));
+            var result = ScriptTestRunner.Default.Execute($"\"{Path.Combine(TestPathUtils.GetPathToTestFixtureFolder("Issue189"), "SomeFolder", "Script.csx")}\"");
             Assert.Contains("Newtonsoft.Json.JsonConvert", result.output);
         }
 

diff --git a/src/Dotnet.Script.Tests/ScriptPackagesFixture.cs b/src/Dotnet.Script.Tests/ScriptPackagesFixture.cs
@@ -43,12 +43,12 @@ private void BuildScriptPackages()
                 if (_scriptEnvironment.IsWindows)
                 {
                     command = pathtoNuget430;
-                    var result = ProcessHelper.RunAndCaptureOutput(command, $"pack {specFile} -OutputDirectory {pathToPackagesOutputFolder}");
+                    var result = ProcessHelper.RunAndCaptureOutput(command, $"pack \"{specFile}\" -OutputDirectory \"{pathToPackagesOutputFolder}\"");
                 }
                 else
                 {
                     command = "mono";
-                    var result = ProcessHelper.RunAndCaptureOutput(command, $"{pathtoNuget430} pack {specFile} -OutputDirectory {pathToPackagesOutputFolder}");
+                    var result = ProcessHelper.RunAndCaptureOutput(command, $"\"{pathtoNuget430}\" pack \"{specFile}\" -OutputDirectory \"{pathToPackagesOutputFolder}\"");
                 }
 
             }

diff --git a/src/Dotnet.Script.Tests/ScriptTestRunner.cs b/src/Dotnet.Script.Tests/ScriptTestRunner.cs
@@ -38,15 +38,15 @@ public int ExecuteInProcess(string arguments = null)
         public (string output, int exitCode) ExecuteFixture(string fixture, string arguments = null, string workingDirectory = null)
         {
             var pathToFixture = TestPathUtils.GetPathToTestFixture(fixture);
-            var result = ProcessHelper.RunAndCaptureOutput("dotnet", GetDotnetScriptArguments($"{pathToFixture} {arguments}"), workingDirectory);
+            var result = ProcessHelper.RunAndCaptureOutput("dotnet", GetDotnetScriptArguments($"\"{pathToFixture}\" {arguments}"), workingDirectory);
             return result;
         }
 
         public (string output, int exitcode) ExecuteWithScriptPackage(string fixture, string arguments = null, string workingDirectory = null)
         {
             var pathToScriptPackageFixtures = TestPathUtils.GetPathToTestFixtureFolder("ScriptPackage");
             var pathToFixture = Path.Combine(pathToScriptPackageFixtures, fixture, $"{fixture}.csx");
-            return ProcessHelper.RunAndCaptureOutput("dotnet", GetDotnetScriptArguments($"{pathToFixture} {arguments}"), workingDirectory);
+            return ProcessHelper.RunAndCaptureOutput("dotnet", GetDotnetScriptArguments($"\"{pathToFixture}\" {arguments}"), workingDirectory);
         }
 
         public int ExecuteFixtureInProcess(string fixture, string arguments = null)
@@ -88,7 +88,7 @@ private string GetDotnetScriptArguments(string arguments)
             configuration = "Release";
 #endif
 
-            var allArgs = $"exec {Path.Combine(Directory.GetCurrentDirectory(), "..", "..", "..", "..", "Dotnet.Script", "bin", configuration, _scriptEnvironment.TargetFramework, "dotnet-script.dll")} {arguments}";
+            var allArgs = $"exec \"{Path.Combine(Directory.GetCurrentDirectory(), "..", "..", "..", "..", "Dotnet.Script", "bin", configuration, _scriptEnvironment.TargetFramework, "dotnet-script.dll")}\" {arguments}";
 
             return allArgs;
         }