Skip to content

Fix New-Item -Path/-Target with wildcard char #9259

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

Closed
kwkam wants to merge 10 commits into from
Closed

Fix New-Item -Path/-Target with wildcard char #9259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0d37aae
[Feature] Fix New-Item -Path with wildcard char
kwkam Jul 30, 2018
38222e8
Add test
kwkam Aug 12, 2018
97aca06
Use named parameters in New-Item test
kwkam Aug 31, 2018
80b5673
Cosmetic change on Remove-Item.Tests
kwkam Jan 11, 2019
e3ee292
Suppress New-Item output in test
iSazonov Apr 1, 2019
582f67d
Use BeExactly instead of Match in test
kwkam May 5, 2019
84a23ed
Use Get-Item instead of Get-ChildItem
kwkam May 5, 2019
581dd2a
Fix symlink target
kwkam May 7, 2019
bf08aad
Prepend dot to relative path
kwkam May 8, 2019
258e2cd
Use char in StartsWith
kwkam May 8, 2019
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
13 changes: 9 additions & 4 deletions src/System.Management.Automation/engine/SessionStateContainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3443,7 +3443,7 @@ internal void NewItem(
if (string.IsNullOrEmpty(name))
{
string providerPath =
Globber.GetProviderPath(resolvePath, context, out provider, out driveInfo);
Globber.GetProviderPath(WildcardPattern.Unescape(resolvePath), context, out provider, out driveInfo);

providerInstance = GetProviderInstance(provider);
providerPaths.Add(providerPath);
Expand Down Expand Up @@ -3535,9 +3535,14 @@ internal void NewItem(
throw PSTraceSource.NewInvalidOperationException(SessionStateStrings.PathNotFound, targetPath);
}

// If the original target was a relative path, we want to leave it as relative if it did not require
// globbing to resolve.
if (WildcardPattern.ContainsWildcardCharacters(targetPath))
// If the original target was a relative path, we want to leave it as relative
if (targetPath.StartsWith('.'))
{
var sessionState = ExecutionContext.EngineSessionState;
string resolvedPath = sessionState.NormalizeRelativePath(globbedTarget[0], sessionState.CurrentLocation.ProviderPath);
content = resolvedPath.StartsWith('.') ? resolvedPath : Path.Combine(".", resolvedPath);
}
else
{
content = globbedTarget[0];
}
Expand Down
32 changes: 30 additions & 2 deletions test/powershell/Modules/Microsoft.PowerShell.Management/New-Item.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,17 @@ function Clean-State
Describe "New-Item" -Tags "CI" {
$tmpDirectory = $TestDrive
$testfile = "testfile.txt"
$testfileSp = "``[test``]file.txt"
$testfolder = "newDirectory"
$testsubfolder = "newSubDirectory"
$testlink = "testlink"
$FullyQualifiedFile = Join-Path -Path $tmpDirectory -ChildPath $testfile
$FullyQualifiedFileSp = Join-Path -Path $tmpDirectory -ChildPath $testfileSp
$FullyQualifiedFolder = Join-Path -Path $tmpDirectory -ChildPath $testfolder
$FullyQualifiedLink = Join-Path -Path $tmpDirectory -ChildPath $testlink
$FullyQualifiedSubFolder = Join-Path -Path $FullyQualifiedFolder -ChildPath $testsubfolder
$FullyQualifiedFileInFolder = Join-Path -Path $FullyQualifiedFolder -ChildPath $testfile


BeforeEach {
Clean-State
}
Expand Down Expand Up @@ -103,9 +104,15 @@ Describe "New-Item" -Tags "CI" {
Test-Path $FullyQualifiedFile | Should -BeTrue
}

It "Should create a file with correct name when Name switch is not used and Path contains special char" {
New-Item -Path $FullyQualifiedFileSp -ItemType file > $null

$FullyQualifiedFileSp | Should -Exist
}

It "Should be able to create a multiple items in different directories" {
$FullyQualifiedFile2 = Join-Path -Path $tmpDirectory -ChildPath test2.txt
New-Item -ItemType file -Path $FullyQualifiedFile, $FullyQualifiedFile2
New-Item -ItemType file -Path $FullyQualifiedFile, $FullyQualifiedFile2 > $null

Test-Path $FullyQualifiedFile | Should -BeTrue
Test-Path $FullyQualifiedFile2 | Should -BeTrue
Expand Down Expand Up @@ -196,9 +203,15 @@ Describe "New-Item with links" -Tags @('CI', 'RequireAdminOnWindows') {
$testfile = "testfile.txt"
$testfolder = "newDirectory"
$testlink = "testlink"
$testlinkSrcSpName = "[test]src"
$testlinkSrcSp = "``[test``]src"
$testlinkSpName = "[test]link"
$testlinkSp = "``[test``]link"
$FullyQualifiedFile = Join-Path -Path $tmpDirectory -ChildPath $testfile
$FullyQualifiedFolder = Join-Path -Path $tmpDirectory -ChildPath $testfolder
$FullyQualifiedLink = Join-Path -Path $tmpDirectory -ChildPath $testlink
$FullyQualifiedLSrcSp = Join-Path -Path $tmpDirectory -ChildPath $testlinkSrcSp
$FullyQualifiedLinkSp = Join-Path -Path $tmpDirectory -ChildPath $testlinkSp
$SymLinkMask = [System.IO.FileAttributes]::ReparsePoint
$DirLinkMask = $SymLinkMask -bor [System.IO.FileAttributes]::Directory

Expand Down Expand Up @@ -249,6 +262,21 @@ Describe "New-Item with links" -Tags @('CI', 'RequireAdminOnWindows') {
Test-Path $FullyQualifiedLink | Should -BeFalse
}

It "Should create symbolic link with name contains special char" {
New-Item -Path $tmpDirectory -Name $testlinkSrcSpName -ItemType File > $null
$FullyQualifiedLSrcSp | Should -Exist

New-Item -Path $FullyQualifiedLinkSp -Target $FullyQualifiedLSrcSp -ItemType SymbolicLink > $null
$FullyQualifiedLinkSp | Should -Exist

$expectedTarget = Join-Path -Path $tmpDirectory -ChildPath $testlinkSrcSpName

$fileInfo = Get-Item -Path $FullyQualifiedLinkSp
$fileInfo.Target | Should -BeExactly $expectedTarget
$fileInfo.LinkType | Should -BeExactly "SymbolicLink"
$fileInfo.Attributes -band $DirLinkMask | Should -BeExactly $SymLinkMask
}

It "New-Item -ItemType SymbolicLink should understand directory path ending with slash" {
$folderName = [System.IO.Path]::GetRandomFileName()
$symbolicLinkPath = New-Item -ItemType SymbolicLink -Path "$tmpDirectory/$folderName/" -Value "/bar/"
Expand Down
17 changes: 14 additions & 3 deletions test/powershell/Modules/Microsoft.PowerShell.Management/Remove-Item.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License.
Describe "Remove-Item" -Tags "CI" {
$testpath = $TestDrive
$testfile = "testfile.txt"
$testfilepath = Join-Path -Path $testpath -ChildPath $testfile
$testpath = $TestDrive
$testfile = "testfile.txt"
$testfileSpName = "[testfile].txt"
$testfileSp = "``[testfile``].txt"
$testfilepath = Join-Path -Path $testpath -ChildPath $testfile
$testfilepathSp = Join-Path -Path $testpath -ChildPath $testfileSp
Context "File removal Tests" {
BeforeEach {
New-Item -Name $testfile -Path $testpath -ItemType "file" -Value "lorem ipsum" -Force
Expand Down Expand Up @@ -109,6 +112,14 @@ Describe "Remove-Item" -Tags "CI" {
Test-Path (Join-Path -Path $testpath -ChildPath file1.wav) | Should -BeFalse
Test-Path (Join-Path -Path $testpath -ChildPath file2.wav) | Should -BeFalse
}

It "Should be able to remove file when path contains special char" {
New-Item -Path $testpath -Name $testfileSpName -ItemType File -Force > $null
$testfilepathSp | Should -Exist

Remove-Item -Path $testfilepathSp -Force
$testfilepathSp | Should -Not -Exist
}
}

Context "Directory Removal Tests" {
Expand Down