check for existing relative path notation before adding current path …

…period
PowerShell · Mar 11, 2024 · 542b76c · 542b76c
1 parent 5333f3f
commit 542b76c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/ResolvePathCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/ResolvePathCommand.cs
@@ -223,7 +223,8 @@ protected override void ProcessRecord()
                             // Do not insert './' if result path is not relative
                             if (!adjustedPath.StartsWith(
                                     currentPath.Drive?.Root ?? currentPath.Path, StringComparison.OrdinalIgnoreCase) &&
-                                !adjustedPath.StartsWith("." + currentPath.Provider.ItemSeparator, StringComparison.OrdinalIgnoreCase))
+                                !adjustedPath.StartsWith("." + currentPath.Provider.ItemSeparator, StringComparison.OrdinalIgnoreCase) &&
+                                !adjustedPath.StartsWith(".." + currentPath.Provider.ItemSeparator, StringComparison.OrdinalIgnoreCase))
                             {
                                 adjustedPath = SessionState.Path.Combine(".", adjustedPath);
                             }

diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Resolve-Path.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Resolve-Path.Tests.ps1
@@ -127,4 +127,19 @@ Describe "Resolve-Path returns proper path" -Tag "CI" {
             Pop-Location
         }
     }
+
+    It 'does not return path containing both current and parent directory' {
+        $testDir = Join-Path $TestDrive "testDir"
+        $null = New-Item -Path $testDir -ItemType Directory -Force
+        $testFile = Join-Path $testDrive "testfile"
+        $null = New-Item -Path $testFile -ItemType File -Force
+        try {
+            Push-Location $testDir
+            $result = Resolve-Path -Path "..\testfile" -Relative
+            $result | Should -BeExactly (Join-Path '..' 'testfile')
+        }
+        finally {
+            Pop-Location
+        }
+    }
 }