Skip to content

Fix Start-Job -WorkingDirectory with whitespace #10951

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
anmenaga merged 4 commits into from
Nov 1, 2019
Merged

Fix Start-Job -WorkingDirectory with whitespace #10951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8a06927
Fix `Start-Job -WorkingDirectory` with whitespace
SteveL-MSFT Oct 30, 2019
ef8c4ed
escape workingdirectory that may contain double quotes
SteveL-MSFT Oct 31, 2019
5ec34c2
split whitespace and quote test since Windows doesn't allow quote in …
SteveL-MSFT Oct 31, 2019
e2ffc42
address CodeFactor
SteveL-MSFT Oct 31, 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
8 changes: 4 additions & 4 deletions src/System.Management.Automation/engine/hostifaces/PowerShellProcessInstance.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ static PowerShellProcessInstance()
}
Comment thread
SteveL-MSFT marked this conversation as resolved.
Comment thread
SteveL-MSFT marked this conversation as resolved.

/// <summary>
/// Initializes a new instance of the <see cref="PowerShellProcessInstance"/> class. Initializes the underlying dotnet process class.
/// Initializes a new instance of the <see cref="PowerShellProcessInstance"/> class. Initializes the underlying dotnet process class.
/// </summary>
/// <param name="powerShellVersion">Specifies the version of powershell.</param>
/// <param name="credential">Specifies a user account credentials.</param>
Expand All @@ -56,9 +56,9 @@ public PowerShellProcessInstance(Version powerShellVersion, PSCredential credent
{
processArguments = string.Format(
CultureInfo.InvariantCulture,
"{0} -wd {1}",
"{0} -wd \"{1}\"",
processArguments,
workingDirectory);
workingDirectory.Replace("\"", "\"\""));
}

if (initializationScript != null)
Expand Down Expand Up @@ -105,7 +105,7 @@ public PowerShellProcessInstance(Version powerShellVersion, PSCredential credent
}

/// <summary>
/// Initializes a new instance of the <see cref="PowerShellProcessInstance"/> class. Initializes the underlying dotnet process class.
/// Initializes a new instance of the <see cref="PowerShellProcessInstance"/> class. Initializes the underlying dotnet process class.
/// </summary>
/// <param name="powerShellVersion"></param>
/// <param name="credential"></param>
Expand Down
16 changes: 13 additions & 3 deletions test/powershell/engine/Job/Jobs.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,20 @@ Describe 'Basic Job Tests' -Tags 'CI' {
$ProgressMsg[0].StatusDescription | Should -BeExactly 2
}

It 'Can use the user specified working directory parameter' {
$job = Start-Job -ScriptBlock { $pwd } -WorkingDirectory $TestDrive | Wait-Job
It 'Can use the user specified working directory parameter with whitespace' {
$path = Join-Path -Path $TestDrive -ChildPath "My Dir"
$null = New-Item -ItemType Directory -Path "$path"
$job = Start-Job -ScriptBlock { $pwd } -WorkingDirectory $path | Wait-Job
$jobOutput = Receive-Job $job
$jobOutput | Should -BeExactly $TestDrive.ToString()
$jobOutput | Should -BeExactly $path.ToString()
}

It 'Can use the user specified working directory parameter with quote' -Skip:($IsWindows) {
$path = Join-Path -Path $TestDrive -ChildPath "My ""Dir"
$null = New-Item -ItemType Directory -Path "$path"
$job = Start-Job -ScriptBlock { $pwd } -WorkingDirectory $path | Wait-Job
$jobOutput = Receive-Job $job
$jobOutput | Should -BeExactly $path.ToString()
}

It 'Throws an error when the working directory parameter is <case>' -TestCases $invalidPathTestCases {
Expand Down