Skip to content

Fix System32 module path duplication #7414

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
Aug 3, 2018
Merged

Fix System32 module path duplication #7414

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
d7647b3
[Feature] Prevent duplication of System32 module path
Jul 31, 2018
4318cf9
[Feature] Fix test path
Jul 31, 2018
0a427f0
[Feature] Compare path count to a number to test properly
Jul 31, 2018
aecea28
[Feature] Escape path in regex
Jul 31, 2018
137c076
[Feature] Set expected System32 paths to always be 1
Aug 1, 2018
1774df9
[Feature] Remove redundant skips in tests
Aug 2, 2018
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
6 changes: 5 additions & 1 deletion src/System.Management.Automation/engine/Modules/ModuleIntrinsics.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -948,7 +948,11 @@ private static string SetModulePath()
#if !UNIX
// If on Windows, we want to add the System32 Windows PowerShell module directory
// so that Windows modules are discoverable
newModulePathString += Path.PathSeparator + GetWindowsPowerShellPSHomeModulePath();
string windowsPowerShellModulePath = GetWindowsPowerShellPSHomeModulePath();
if (!newModulePathString.Contains(windowsPowerShellModulePath, StringComparison.OrdinalIgnoreCase))
{
newModulePathString += Path.PathSeparator + windowsPowerShellModulePath;
}
#endif

// Set the environment variable...
Expand Down
48 changes: 30 additions & 18 deletions test/powershell/Modules/Microsoft.PowerShell.Core/CompatiblePSEditions.Module.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,30 +324,42 @@ Describe "Import-Module from CompatiblePSEditions-checked paths" -Tag "CI" {
}

Describe "PSModulePath changes interacting with other PowerShell processes" -Tag "Feature" {
BeforeAll {
if (-not $IsWindows)
{
return
$PSDefaultParameterValues = @{ 'It:Skip' = (-not $IsWindows) }

Context "System32 module path prepended to PSModulePath" {
BeforeAll {
if (-not $IsWindows)
{
return
}
Add-ModulePath (Join-Path $env:windir "System32\WindowsPowerShell\v1.0\Modules") -Prepend
}
Add-ModulePath (Join-Path $env:windir "System32\WindowsPowerShell\v1.0\Modules") -Prepend
}

AfterAll {
if (-not $IsWindows)
{
return
AfterAll {
if (-not $IsWindows)
{
return
}
Restore-ModulePath
}

It "Allows Windows PowerShell subprocesses to call `$PSHome modules still" {
$errors = powershell.exe -Command "Get-ChildItem" 2>&1 | Where-Object { $_ -is [System.Management.Automation.ErrorRecord] }
$errors | Should -Be $null
}
Restore-ModulePath
}

It "Allows Windows PowerShell subprocesses to call `$PSHome modules still" -Skip:(-not $IsWindows) {
$errors = powershell.exe -Command "Get-ChildItem" 2>&1 | Where-Object { $_ -is [System.Management.Automation.ErrorRecord] }
$errors | Should -Be $null
It "Allows PowerShell Core 6 subprocesses to call core modules" {
$errors = pwsh.exe -Command "Get-ChildItem" 2>&1 | Where-Object { $_ -is [System.Management.Automation.ErrorRecord] }
$errors | Should -Be $null
}
}

It "Allows PowerShell Core 6 subprocesses to call core modules" -Skip:(-not $IsWindows) {
$errors = pwsh.exe -Command "Get-ChildItem" 2>&1 | Where-Object { $_ -is [System.Management.Automation.ErrorRecord] }
$errors | Should -Be $null
It "Does not duplicate the System32 module path in subprocesses" {
$sys32ModPathCount = pwsh.exe -C {
pwsh.exe -C '$null = $env:PSModulePath -match ([regex]::Escape((Join-Path $env:windir "System32" "WindowsPowerShell" "v1.0" "Modules"))); $matches.Count'
}

$sys32ModPathCount | Should -Be 1
}
}

Expand Down