Fix PowerShell path escaping

src/PowerShellEditorServices.Protocol/Server/DebugAdapter.cs

@@ -259,7 +259,7 @@ protected async Task HandleLaunchRequest(
                 // the path exists and is a directory.
                 if (!string.IsNullOrEmpty(workingDir))
                 {
-                    workingDir = PowerShellContext.UnescapePath(workingDir);
+                    workingDir = PowerShellContext.UnescapeGlobEscapedPath(workingDir);
                     try
                     {
                         if ((File.GetAttributes(workingDir) & FileAttributes.Directory) != FileAttributes.Directory)

src/PowerShellEditorServices/Debugging/DebugService.cs

@@ -178,7 +178,7 @@ public async Task<BreakpointDetails[]> SetLineBreakpoints(
             // Fix for issue #123 - file paths that contain wildcard chars [ and ] need to
             // quoted and have those wildcard chars escaped.
             string escapedScriptPath =
-                PowerShellContext.EscapePath(scriptPath, escapeSpaces: false);
+                PowerShellContext.GlobEscapePath(scriptPath);
 
             if (dscBreakpoints == null || !dscBreakpoints.IsDscResourcePath(escapedScriptPath))
             {

src/PowerShellEditorServices/Properties/AssemblyInfo.cs

@@ -5,6 +5,7 @@
 
 using System.Runtime.CompilerServices;
 
+[assembly: InternalsVisibleTo("Microsoft.PowerShell.EditorServices.Protocol")]
 [assembly: InternalsVisibleTo("Microsoft.PowerShell.EditorServices.Test")]
 [assembly: InternalsVisibleTo("Microsoft.PowerShell.EditorServices.Test.Shared")]
 

src/PowerShellEditorServices/Session/PowerShellContext.cs

@@ -23,6 +23,7 @@ namespace Microsoft.PowerShell.EditorServices
     using System.Management.Automation.Runspaces;
     using Microsoft.PowerShell.EditorServices.Session.Capabilities;
     using System.IO;
+    using System.ComponentModel;
 
     /// <summary>
     /// Manages the lifetime and usage of a PowerShell session.
@@ -796,7 +797,7 @@ public async Task ExecuteScriptWithArgs(string script, string arguments = null,
                 if (File.Exists(script) || File.Exists(scriptAbsPath))
                 {
                     // Dot-source the launched script path
-                    script = ". " + EscapePath(script, escapeSpaces: true);
+                    script = ". " + QuoteEscapeString(script);
                 }
 
                 launchedScript = script + " " + arguments;
@@ -1113,30 +1114,144 @@ public async Task SetWorkingDirectory(string path, bool isPathAlreadyEscaped)
             {
                 if (!isPathAlreadyEscaped)
                 {
-                    path = EscapePath(path, false);
+                    path = GlobEscapePath(path);
                 }
 
                 runspaceHandle.Runspace.SessionStateProxy.Path.SetLocation(path);
             }
         }
 
+        /// <summary>
+        /// Fully escape a given path for use in PowerShell script.
+        /// Note: this will not work with PowerShell.AddParameter()
+        /// </summary>
+        /// <param name="path">The path to escape.</param>
+        /// <returns>An escaped version of the path that can be embedded in PowerShell script.</returns>
+        internal static string FullyPowerShellEscapePath(string path)
+        {
+            string globEscapedPath = GlobEscapePath(path);
+            return QuoteEscapeString(globEscapedPath);
+        }
+
+        /// <summary>
+        /// Wrap a string in quotes to make it safe to use in scripts.
+        /// </summary>
+        /// <param name="escapedPath">The glob-escaped path to wrap in quotes.</param>
+        /// <returns>The given path wrapped in quotes appropriately.</returns>
+        internal static string QuoteEscapeString(string escapedPath)
+        {
+            var sb = new StringBuilder(escapedPath.Length + 2); // Length of string plus two quotes
+            sb.Append('\'');
+            if (!escapedPath.Contains('\''))
+            {
+                sb.Append(escapedPath);
+            }
+            else
+            {
+                foreach (char c in escapedPath)
+                {
+                    if (c == '\'')
+                    {
+                        sb.Append("''");
+                        continue;
+                    }
+
+                    sb.Append(c);
+                }
+            }
+            sb.Append('\'');
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Return the given path with all PowerShell globbing characters escaped,
+        /// plus optionally the whitespace.
+        /// </summary>
+        /// <param name="path">The path to process.</param>
+        /// <param name="escapeSpaces">Specify True to escape spaces in the path, otherwise False.</param>
+        /// <returns>The path with [ and ] escaped.</returns>
+        internal static string GlobEscapePath(string path, bool escapeSpaces = false)
+        {
+            var sb = new StringBuilder();
+            for (int i = 0; i < path.Length; i++)
+            {
+                char curr = path[i];
+                switch (curr)
+                {
+                    // Escape '[', ']', '?' and '*' with '`'
+                    case '[':
+                    case ']':
+                    case '*':
+                    case '?':
+                        sb.Append('`').Append(curr);
+                        break;
+
+                    default:
+                        // Escape whitespace if required
+                        if (escapeSpaces && char.IsWhiteSpace(curr))
+                        {
+                            sb.Append('`').Append(curr);
+                            break;
+                        }
+                        sb.Append(curr);
+                        break;
+                }
+            }
+
+            return sb.ToString();
+        }
+
         /// <summary>
         /// Returns the passed in path with the [ and ] characters escaped. Escaping spaces is optional.
         /// </summary>
         /// <param name="path">The path to process.</param>
         /// <param name="escapeSpaces">Specify True to escape spaces in the path, otherwise False.</param>
         /// <returns>The path with [ and ] escaped.</returns>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [Obsolete("This API is not meant for public usage and should not be used.")]
         public static string EscapePath(string path, bool escapeSpaces)
         {
-            string escapedPath = Regex.Replace(path, @"(?<!`)\[", "`[");
-            escapedPath = Regex.Replace(escapedPath, @"(?<!`)\]", "`]");
+            return GlobEscapePath(path, escapeSpaces);
+        }
+
+        internal static string UnescapeGlobEscapedPath(string globEscapedPath)
+        {
+            // Prevent relying on my implementation if we can help it
+            if (!globEscapedPath.Contains('`'))
+            {
+                return globEscapedPath;
+            }
 
-            if (escapeSpaces)
+            var sb = new StringBuilder(globEscapedPath.Length);
+            for (int i = 0; i < globEscapedPath.Length; i++)
             {
-                escapedPath = Regex.Replace(escapedPath, @"(?<!`) ", "` ");
+                // If we see a backtick perform a lookahead
+                char curr = globEscapedPath[i];
+                if (curr == '`' && i + 1 < globEscapedPath.Length)
+                {
+                    // If the next char is an escapable one, don't add this backtick to the new string
+                    char next = globEscapedPath[i + 1];
+                    switch (next)
+                    {
+                        case '[':
+                        case ']':
+                        case '?':
+                        case '*':
+                            continue;
+
+                        default:
+                            if (char.IsWhiteSpace(next))
+                            {
+                                continue;
+                            }
+                            break;
+                    }
+                }
+
+                sb.Append(curr);
             }
 
-            return escapedPath;
+            return sb.ToString();
         }
 
         /// <summary>
@@ -1145,14 +1260,11 @@ public static string EscapePath(string path, bool escapeSpaces)
         /// </summary>
         /// <param name="path">The path to unescape.</param>
         /// <returns>The path with the ` character before [, ] and spaces removed.</returns>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [Obsolete("This API is not meant for public usage and should not be used.")]
         public static string UnescapePath(string path)
         {
-            if (!path.Contains("`"))
-            {
-                return path;
-            }
-
-            return Regex.Replace(path, @"`(?=[ \[\]])", "");
+            return UnescapeGlobEscapedPath(path);
         }
 
         #endregion

src/PowerShellEditorServices/Workspace/Workspace.cs

@@ -373,7 +373,7 @@ internal string ResolveFilePath(string filePath)
                 // Clients could specify paths with escaped space, [ and ] characters which .NET APIs
                 // will not handle.  These paths will get appropriately escaped just before being passed
                 // into the PowerShell engine.
-                filePath = PowerShellContext.UnescapePath(filePath);
+                filePath = PowerShellContext.UnescapeGlobEscapedPath(filePath);
 
                 // Get the absolute file path
                 filePath = Path.GetFullPath(filePath);

test/PowerShellEditorServices.Test.Shared/scriptassets/Bad&name4script.ps1

@@ -0,0 +1,4 @@
+function Hello
+{
+    "Bye"
+}

test/PowerShellEditorServices.Test.Shared/scriptassets/[Truly] b&d Name_4_script.ps1

@@ -0,0 +1 @@
+Write-Output "Windows won't let me put * or ? in the name of this file..."

test/PowerShellEditorServices.Test/Debugging/DebugServiceTests.cs

@@ -105,7 +105,7 @@ public async Task DebuggerAcceptsScriptArgs(string[] args)
             // it should not escape already escaped chars.
             ScriptFile debugWithParamsFile =
                 this.workspace.GetFile(
-                    @"..\..\..\..\PowerShellEditorServices.Test.Shared\Debugging\Debug` With Params `[Test].ps1");
+                    @"..\..\..\..\PowerShellEditorServices.Test.Shared\Debugging\Debug` W&ith Params `[Test].ps1");
 
             await this.debugService.SetLineBreakpoints(
                 debugWithParamsFile,

test/PowerShellEditorServices.Test/Session/PathEscapingTests.cs

@@ -0,0 +1,132 @@
+using System;
+using Xunit;
+using Microsoft.PowerShell.EditorServices;
+using System.IO;
+
+namespace Microsoft.PowerShell.EditorServices.Test.Session
+{
+    public class PathEscapingTests
+    {
+        private const string ScriptAssetPath = @"..\..\..\..\PowerShellEditorServices.Test.Shared\scriptassets";
+
+        [Theory]
+        [InlineData("DebugTest.ps1", "DebugTest.ps1")]
+        [InlineData("../../DebugTest.ps1", "../../DebugTest.ps1")]
+        [InlineData("C:\\Users\\me\\Documents\\DebugTest.ps1", "C:\\Users\\me\\Documents\\DebugTest.ps1")]
+        [InlineData("/home/me/Documents/weird&folder/script.ps1", "/home/me/Documents/weird&folder/script.ps1")]
+        [InlineData("./path/with some/spaces", "./path/with some/spaces")]
+        [InlineData("C:\\path\\with[some]brackets\\file.ps1", "C:\\path\\with`[some`]brackets\\file.ps1")]
+        [InlineData("C:\\look\\an*\\here.ps1", "C:\\look\\an`*\\here.ps1")]
+        [InlineData("/Users/me/Documents/?here.ps1", "/Users/me/Documents/`?here.ps1")]
+        [InlineData("/Brackets [and s]paces/path.ps1", "/Brackets `[and s`]paces/path.ps1")]
+        [InlineData("/CJK.chars/脚本/hello.ps1", "/CJK.chars/脚本/hello.ps1")]
+        [InlineData("/CJK.chars/脚本/[hello].ps1", "/CJK.chars/脚本/`[hello`].ps1")]
+        [InlineData("C:\\Animals\\утка\\quack.ps1", "C:\\Animals\\утка\\quack.ps1")]
+        [InlineData("C:\\&nimals\\утка\\qu*ck?.ps1", "C:\\&nimals\\утка\\qu`*ck`?.ps1")]
+        public void CorrectlyGlobEscapesPaths_NoSpaces(string unescapedPath, string escapedPath)
+        {
+            string extensionEscapedPath = PowerShellContext.GlobEscapePath(unescapedPath);
+            Assert.Equal(escapedPath, extensionEscapedPath);
+        }
+
+        [Theory]
+        [InlineData("DebugTest.ps1", "DebugTest.ps1")]
+        [InlineData("../../DebugTest.ps1", "../../DebugTest.ps1")]
+        [InlineData("C:\\Users\\me\\Documents\\DebugTest.ps1", "C:\\Users\\me\\Documents\\DebugTest.ps1")]
+        [InlineData("/home/me/Documents/weird&folder/script.ps1", "/home/me/Documents/weird&folder/script.ps1")]
+        [InlineData("./path/with some/spaces", "./path/with` some/spaces")]
+        [InlineData("C:\\path\\with[some]brackets\\file.ps1", "C:\\path\\with`[some`]brackets\\file.ps1")]
+        [InlineData("C:\\look\\an*\\here.ps1", "C:\\look\\an`*\\here.ps1")]
+        [InlineData("/Users/me/Documents/?here.ps1", "/Users/me/Documents/`?here.ps1")]
+        [InlineData("/Brackets [and s]paces/path.ps1", "/Brackets` `[and` s`]paces/path.ps1")]
+        [InlineData("/CJK chars/脚本/hello.ps1", "/CJK` chars/脚本/hello.ps1")]
+        [InlineData("/CJK chars/脚本/[hello].ps1", "/CJK` chars/脚本/`[hello`].ps1")]
+        [InlineData("C:\\Animal s\\утка\\quack.ps1", "C:\\Animal` s\\утка\\quack.ps1")]
+        [InlineData("C:\\&nimals\\утка\\qu*ck?.ps1", "C:\\&nimals\\утка\\qu`*ck`?.ps1")]
+        public void CorrectlyGlobEscapesPaths_Spaces(string unescapedPath, string escapedPath)
+        {
+            string extensionEscapedPath = PowerShellContext.GlobEscapePath(unescapedPath, escapeSpaces: true);
+            Assert.Equal(escapedPath, extensionEscapedPath);
+        }
+
+        [Theory]
+        [InlineData("DebugTest.ps1", "'DebugTest.ps1'")]
+        [InlineData("../../DebugTest.ps1", "'../../DebugTest.ps1'")]
+        [InlineData("C:\\Users\\me\\Documents\\DebugTest.ps1", "'C:\\Users\\me\\Documents\\DebugTest.ps1'")]
+        [InlineData("/home/me/Documents/weird&folder/script.ps1", "'/home/me/Documents/weird&folder/script.ps1'")]
+        [InlineData("./path/with some/spaces", "'./path/with some/spaces'")]
+        [InlineData("C:\\path\\with[some]brackets\\file.ps1", "'C:\\path\\with[some]brackets\\file.ps1'")]
+        [InlineData("C:\\look\\an*\\here.ps1", "'C:\\look\\an*\\here.ps1'")]
+        [InlineData("/Users/me/Documents/?here.ps1", "'/Users/me/Documents/?here.ps1'")]
+        [InlineData("/Brackets [and s]paces/path.ps1", "'/Brackets [and s]paces/path.ps1'")]
+        [InlineData("/file path/that isn't/normal/", "'/file path/that isn''t/normal/'")]
+        [InlineData("/CJK.chars/脚本/hello.ps1", "'/CJK.chars/脚本/hello.ps1'")]
+        [InlineData("/CJK chars/脚本/[hello].ps1", "'/CJK chars/脚本/[hello].ps1'")]
+        [InlineData("C:\\Animal s\\утка\\quack.ps1", "'C:\\Animal s\\утка\\quack.ps1'")]
+        [InlineData("C:\\&nimals\\утка\\qu*ck?.ps1", "'C:\\&nimals\\утка\\qu*ck?.ps1'")]
+        public void CorrectlyQuoteEscapesPaths(string unquotedPath, string expectedQuotedPath)
+        {
+            string extensionQuotedPath = PowerShellContext.QuoteEscapeString(unquotedPath);
+            Assert.Equal(expectedQuotedPath, extensionQuotedPath);
+        }
+
+        [Theory]
+        [InlineData("DebugTest.ps1", "'DebugTest.ps1'")]
+        [InlineData("../../DebugTest.ps1", "'../../DebugTest.ps1'")]
+        [InlineData("C:\\Users\\me\\Documents\\DebugTest.ps1", "'C:\\Users\\me\\Documents\\DebugTest.ps1'")]
+        [InlineData("/home/me/Documents/weird&folder/script.ps1", "'/home/me/Documents/weird&folder/script.ps1'")]
+        [InlineData("./path/with some/spaces", "'./path/with some/spaces'")]
+        [InlineData("C:\\path\\with[some]brackets\\file.ps1", "'C:\\path\\with`[some`]brackets\\file.ps1'")]
+        [InlineData("C:\\look\\an*\\here.ps1", "'C:\\look\\an`*\\here.ps1'")]
+        [InlineData("/Users/me/Documents/?here.ps1", "'/Users/me/Documents/`?here.ps1'")]
+        [InlineData("/Brackets [and s]paces/path.ps1", "'/Brackets `[and s`]paces/path.ps1'")]
+        [InlineData("/file path/that isn't/normal/", "'/file path/that isn''t/normal/'")]
+        [InlineData("/CJK.chars/脚本/hello.ps1", "'/CJK.chars/脚本/hello.ps1'")]
+        [InlineData("/CJK chars/脚本/[hello].ps1", "'/CJK chars/脚本/`[hello`].ps1'")]
+        [InlineData("C:\\Animal s\\утка\\quack.ps1", "'C:\\Animal s\\утка\\quack.ps1'")]
+        [InlineData("C:\\&nimals\\утка\\qu*ck?.ps1", "'C:\\&nimals\\утка\\qu`*ck`?.ps1'")]
+        public void CorrectlyFullyEscapesPaths(string unescapedPath, string escapedPath)
+        {
+            string extensionEscapedPath = PowerShellContext.FullyPowerShellEscapePath(unescapedPath);
+            Assert.Equal(escapedPath, extensionEscapedPath);
+        }
+
+        [Theory]
+        [InlineData("DebugTest.ps1", "DebugTest.ps1")]
+        [InlineData("../../DebugTest.ps1", "../../DebugTest.ps1")]
+        [InlineData("C:\\Users\\me\\Documents\\DebugTest.ps1", "C:\\Users\\me\\Documents\\DebugTest.ps1")]
+        [InlineData("/home/me/Documents/weird&folder/script.ps1", "/home/me/Documents/weird&folder/script.ps1")]
+        [InlineData("./path/with` some/spaces", "./path/with some/spaces")]
+        [InlineData("C:\\path\\with`[some`]brackets\\file.ps1", "C:\\path\\with[some]brackets\\file.ps1")]
+        [InlineData("C:\\look\\an`*\\here.ps1", "C:\\look\\an*\\here.ps1")]
+        [InlineData("/Users/me/Documents/`?here.ps1", "/Users/me/Documents/?here.ps1")]
+        [InlineData("/Brackets` `[and` s`]paces/path.ps1", "/Brackets [and s]paces/path.ps1")]
+        [InlineData("/CJK` chars/脚本/hello.ps1", "/CJK chars/脚本/hello.ps1")]
+        [InlineData("/CJK` chars/脚本/`[hello`].ps1", "/CJK chars/脚本/[hello].ps1")]
+        [InlineData("C:\\Animal` s\\утка\\quack.ps1", "C:\\Animal s\\утка\\quack.ps1")]
+        [InlineData("C:\\&nimals\\утка\\qu`*ck`?.ps1", "C:\\&nimals\\утка\\qu*ck?.ps1")]
+        public void CorrectlyUnescapesPaths(string escapedPath, string expectedUnescapedPath)
+        {
+            string extensionUnescapedPath = PowerShellContext.UnescapeGlobEscapedPath(escapedPath);
+            Assert.Equal(expectedUnescapedPath, extensionUnescapedPath);
+        }
+
+        [Theory]
+        [InlineData("NormalScript.ps1")]
+        [InlineData("Bad&name4script.ps1")]
+        [InlineData("[Truly] b&d Name_4_script.ps1")]
+        public void CanDotSourcePath(string rawFileName)
+        {
+            string fullPath = Path.Combine(ScriptAssetPath, rawFileName);
+            string quotedPath = PowerShellContext.QuoteEscapeString(fullPath);
+
+            var psCommand = new System.Management.Automation.PSCommand().AddScript($". {quotedPath}");
+
+            using (var pwsh = System.Management.Automation.PowerShell.Create())
+            {
+                pwsh.Commands = psCommand;
+                pwsh.Invoke();
+            }
+        }
+    }
+}