Skip to content

Resolve symlink target relative to the symlink instead of the working directory (#15235) #20943

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daxian-dbw merged 6 commits into from
Dec 3, 2024
Merged

Resolve symlink target relative to the symlink instead of the working directory (#15235) #20943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b59db7e
Resolve symlink target relative to the symlink instead of the working…
MatejKafka Dec 18, 2023
62eb6da
Cleanup symbolic link filesystem tests
MatejKafka May 14, 2024
d9af80b
Undo unrelated changes to tests
MatejKafka Nov 22, 2024
dc9a938
Add test for creating symbolic links with relative paths using New-Item
MatejKafka May 14, 2024
33c269a
Unify symlink target slashes before looking up target
MatejKafka Nov 26, 2024
806a6e5
Update src/System.Management.Automation/namespaces/FileSystemProvider.cs
daxian-dbw Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions src/System.Management.Automation/namespaces/FileSystemProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2258,16 +2258,14 @@ protected override void NewItem(
{
exists = true;

var normalizedTargetPath = strTargetPath;
if (strTargetPath.StartsWith(".\\", StringComparison.OrdinalIgnoreCase) ||
strTargetPath.StartsWith("./", StringComparison.OrdinalIgnoreCase))
{
normalizedTargetPath = Path.Join(SessionState.Internal.CurrentLocation.ProviderPath, strTargetPath.AsSpan(2));
}
// unify directory separators to be consistent with the rest of PowerShell even on non-Windows platforms;
// do this before resolving the target, otherwise e.g. `.\test` would break on Linux, since the combined
// path below would be something like `/path/to/cwd/.\test`
strTargetPath = strTargetPath.Replace(StringLiterals.AlternatePathSeparator, StringLiterals.DefaultPathSeparator);

// check if the target is a file or directory
var normalizedTargetPath = Path.Combine(Path.GetDirectoryName(path), strTargetPath);
GetFileSystemInfo(normalizedTargetPath, out isDirectory);

strTargetPath = strTargetPath.Replace(StringLiterals.AlternatePathSeparator, StringLiterals.DefaultPathSeparator);
}
else
{
Expand Down
33 changes: 33 additions & 0 deletions test/powershell/Modules/Microsoft.PowerShell.Management/FileSystem.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.

Import-Module HelpersCommon

Describe "Basic FileSystem Provider Tests" -Tags "CI" {
BeforeAll {
$testDir = "TestDir"
Expand Down Expand Up @@ -621,6 +624,11 @@ Describe "Hard link and symbolic link tests" -Tags "CI", "RequireAdminOnWindows"
}

Context "New-Item and hard/symbolic links" {
AfterEach {
# clean up created links after each test
Remove-Item -Exclude (Split-Path -Leaf $realFile, $realDir, $realDir2) -Recurse $TestPath/*
}

It "New-Item can create a hard link to a file" {
New-Item -ItemType HardLink -Path $hardLinkToFile -Value $realFile > $null
Test-Path $hardLinkToFile | Should -BeTrue
Expand Down Expand Up @@ -664,6 +672,31 @@ Describe "Hard link and symbolic link tests" -Tags "CI", "RequireAdminOnWindows"
$link.LinkType | Should -BeExactly "SymbolicLink"
$link.Target | Should -BeExactly $real.ToString()
}

It "New-Item can create a directory symbolic link to a directory using a relative path" -Skip:(-Not $IsWindows) {
$target = Split-Path -Leaf $realDir
New-Item -ItemType SymbolicLink -Path $symLinkToDir -Value $target > $null
Test-Path $symLinkToDir | Should -BeTrue
$real = Get-Item -Path $realDir
$link = Get-Item -Path $symLinkToDir
$link | Should -BeOfType System.IO.DirectoryInfo
$link.LinkType | Should -BeExactly "SymbolicLink"
$link.ResolvedTarget | Should -BeExactly $real.ToString()
$link.Target | Should -BeExactly $target
}

It "New-Item can create a directory symbolic link to a directory using a relative path with .\" -Skip:(-Not $IsWindows) {
$target = ".\$(Split-Path -Leaf $realDir)"
New-Item -ItemType SymbolicLink -Path $symLinkToDir -Value $target > $null
Test-Path $symLinkToDir | Should -BeTrue
$real = Get-Item -Path $realDir
$link = Get-Item -Path $symLinkToDir
$link | Should -BeOfType System.IO.DirectoryInfo
$link.LinkType | Should -BeExactly "SymbolicLink"
$link.ResolvedTarget | Should -BeExactly $real.ToString()
$link.Target | Should -BeExactly $target
}

It "New-Item can create a directory junction to a directory" -Skip:(-Not $IsWindows) {
New-Item -ItemType Junction -Path $junctionToDir -Value $realDir > $null
Test-Path $junctionToDir | Should -BeTrue
Expand Down
Loading