Skip to content

Fix constructing PSModulePath if a sub-path has trailing separator #13147

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
TravisEz13 merged 6 commits into from
May 2, 2023
Merged

Fix constructing PSModulePath if a sub-path has trailing separator #13147

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
ee4e3f2
Fix constructing PSModulePath if a sub-path has trailing separator
SteveL-MSFT Jul 10, 2020
c5e4841
skip test on Linux
SteveL-MSFT Jul 10, 2020
6af8439
Removed test as the system env var needs to be modified to repro
SteveL-MSFT Jul 10, 2020
00e1410
Add test
SteveL-MSFT Jul 23, 2020
c3cc9de
Fix test by comparing against incorrectly created path
SteveL-MSFT Jul 23, 2020
183114a
Update test to be cross platform
SteveL-MSFT Jul 23, 2020
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
24 changes: 12 additions & 12 deletions 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 @@ -1139,7 +1139,7 @@ private static string AddToPath(string basePath, string pathToAdd, int insertPos
int position = PathContainsSubstring(result.ToString(), subPathToAdd); // searching in effective 'result' value ensures that possible duplicates in pathsToAdd are handled correctly
if (position == -1) // subPathToAdd not found - add it
{
if (insertPosition == -1) // append subPathToAdd to the end
if (insertPosition == -1 || insertPosition > basePath.Length) // append subPathToAdd to the end
{
bool endsWithPathSeparator = false;
if (result.Length > 0)
Expand Down Expand Up @@ -1223,23 +1223,23 @@ public static string GetModulePath(string currentProcessModulePath, string hklmM
// personalModulePath
// sharedModulePath
// systemModulePath
int insertIndex = 0;
if (!string.IsNullOrEmpty(personalModulePathToUse))
currentProcessModulePath = AddToPath(currentProcessModulePath, personalModulePathToUse, 0);
int insertIndex = currentProcessModulePath.IndexOf(Path.PathSeparator, PathContainsSubstring(currentProcessModulePath, personalModulePathToUse));
if (insertIndex != -1)
{
currentProcessModulePath = AddToPath(currentProcessModulePath, personalModulePathToUse, insertIndex);
insertIndex = PathContainsSubstring(currentProcessModulePath, personalModulePathToUse) + personalModulePathToUse.Length + 1;
// advance past the path separator
insertIndex++;
}

if (!string.IsNullOrEmpty(sharedModulePath))
currentProcessModulePath = AddToPath(currentProcessModulePath, sharedModulePath, insertIndex);
insertIndex = currentProcessModulePath.IndexOf(Path.PathSeparator, PathContainsSubstring(currentProcessModulePath, sharedModulePath));
if (insertIndex != -1)
{
currentProcessModulePath = AddToPath(currentProcessModulePath, sharedModulePath, insertIndex);
insertIndex = PathContainsSubstring(currentProcessModulePath, sharedModulePath) + sharedModulePath.Length + 1;
// advance past the path separator
insertIndex++;
}

if (!string.IsNullOrEmpty(systemModulePathToUse))
{
currentProcessModulePath = AddToPath(currentProcessModulePath, systemModulePathToUse, insertIndex);
}
currentProcessModulePath = AddToPath(currentProcessModulePath, systemModulePathToUse, insertIndex);
}

return currentProcessModulePath;
Expand Down
14 changes: 14 additions & 0 deletions test/powershell/engine/Module/ModulePath.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,4 +187,18 @@ Describe "SxS Module Path Basic Tests" -tags "CI" {
Remove-Item -Path $userConfigPath -Force
}
}

It 'User PSModulePath has trailing separator' {
if ($IsWindows) {
$validation = "*\$env:SystemDrive\*"
}
else {
$validation = "*//*"
}

$newUserPath = Join-Path $expectedUserPath ([System.IO.Path]::DirectorySeparatorChar)
$env:PSModulePath = $env:PSModulePath.Replace($expectedUserPath, $newUserPath).Replace($expectedSharedPath,"")
$out = & $powershell -noprofile -command '$env:PSModulePath'
$out.Split([System.IO.Path]::PathSeparator, [System.StringSplitOptions]::RemoveEmptyEntries) | Should -Not -BeLike $validation
}
}