Skip to content

Don't throw exception when trying to resolve a possible link path #16310

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
adityapatwardhan merged 6 commits into from
Oct 30, 2021
Merged

Don't throw exception when trying to resolve a possible link path #16310

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
48b1307
Don't throw exception when trying to resolve a possible link path
daxian-dbw Oct 27, 2021
c92d208
Skip test on non-Windows
daxian-dbw Oct 27, 2021
e9fc6bf
Update the comment
daxian-dbw Oct 27, 2021
85d3c4b
Update test/powershell/Language/Scripting/NativeExecution/NativeComma…
daxian-dbw Oct 29, 2021
6ef6570
Update test/powershell/Language/Scripting/NativeExecution/NativeComma…
daxian-dbw Oct 29, 2021
203cbcc
Fix tests
daxian-dbw Oct 30, 2021
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
15 changes: 12 additions & 3 deletions src/System.Management.Automation/engine/NativeCommandProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1112,10 +1112,19 @@ private static bool IsWindowsApplication(string fileName)
// 1. When starting a process on Windows, if the 'FileName' is a symbolic link, the immediate link target will automatically be used,
// but the OS does not do recursive resolution when the immediate link target is also a symbolic link.
// 2. Keep the same behavior as before adopting the 'LinkTarget' and 'ResolveLinkTarget' APIs in .NET 6.
string linkTarget = File.ResolveLinkTarget(fileName, returnFinalTarget: false)?.FullName;
if (linkTarget is not null)
try
{
string linkTarget = File.ResolveLinkTarget(fileName, returnFinalTarget: false)?.FullName;
if (linkTarget is not null)
{
fileName = linkTarget;
}
}
catch
{
fileName = linkTarget;
// An exception may be thrown from 'File.ResolveLinkTarget' when it fails to resolve a link path,
// for example, when the underlying file system doesn't support reparse points.
// Just use the original file name in this case.
}

SHFILEINFO shinfo = new SHFILEINFO();
Expand Down
45 changes: 45 additions & 0 deletions test/powershell/Language/Scripting/NativeExecution/NativeCommandProcessor.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,3 +252,48 @@ Categories=Application;
{ $dllFile = "$PSHOME\System.Management.Automation.dll"; & $dllFile } | Should -Throw -ErrorId "NativeCommandFailed"
}
}

Describe "Run native command from a mounted FAT-format VHD" -tags @("Feature", "RequireAdminOnWindows") {
BeforeAll {
if (-not $IsWindows) {
return;
}

$vhdx = Join-Path -Path $TestDrive -ChildPath ncp.vhdx

if (Test-Path -Path $vhdx) {
Remove-item -Path $vhdx -Force
}

$create_vhdx = Join-Path -Path $TestDrive -ChildPath 'create_vhdx.txt'

Set-Content -Path $create_vhdx -Force -Value @"
create vdisk file="$vhdx" maximum=20 type=fixed
select vdisk file="$vhdx"
attach vdisk
convert mbr
create partition primary
format fs=fat
assign letter="T"
detach vdisk
"@

diskpart.exe /s $create_vhdx
Mount-DiskImage -ImagePath $vhdx > $null

Copy-Item "$env:WinDir\System32\whoami.exe" T:\whoami.exe
}

AfterAll {
if ($IsWindows) {
Dismount-DiskImage -ImagePath $vhdx
Remove-Item $vhdx, $create_vhdx -Force
}
}

It "Should run 'whoami.exe' from FAT file system without error" -Skip:(!$IsWindows) {
$expected = & "$env:WinDir\System32\whoami.exe"
$result = T:\whoami.exe
$result | Should -BeExactly $expected
}
}