Skip to content

Update folder path for storing optimization profile and add test to validate loaded assemblies and libraries on startup #8406

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 7 commits into from
Dec 6, 2018
Merged

Update folder path for storing optimization profile and add test to validate loaded assemblies and libraries on startup #8406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
980b038
add test to validate loaded assemblies on startup
SteveL-MSFT Nov 22, 2018
73c67ef
address feedback
SteveL-MSFT Dec 5, 2018
12bb147
add 'System.Collections.Immutable.dll' back as it's loaded on startup
SteveL-MSFT Dec 5, 2018
7a3cb58
need to add back 'System.Security.Cryptography.Algorithms.dll'
SteveL-MSFT Dec 5, 2018
06313ee
add back 'System.Security.Permissions.dll'
SteveL-MSFT Dec 5, 2018
042424e
Update the test and the path for storing the optimization profile
daxian-dbw Dec 5, 2018
67e9813
Sort the assembly list
daxian-dbw Dec 6, 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
3 changes: 1 addition & 2 deletions src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,7 @@ internal static int Start(
#if UNIX
profileDir = Platform.SelectProductNameForDirectory(Platform.XDG_Type.CACHE);
#else
profileDir = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) +
@"\Microsoft\Windows\PowerShell";
profileDir = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + @"\Microsoft\PowerShell";

if (!Directory.Exists(profileDir))
{
Expand Down
6 changes: 3 additions & 3 deletions src/System.Management.Automation/engine/InitialSessionState.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2651,16 +2651,16 @@ private Exception ProcessUserDrive(Runspace initializedRunspace)
}

// Create the User drive path directory in current user local appdata location:
// SystemDrive\Users\[user]\AppData\Local\Microsoft\Windows\PowerShell\DriveRoots\[UserName]
// SystemDrive\Users\[user]\AppData\Local\Microsoft\PowerShell\DriveRoots\[UserName]
// Or for virtual accounts
// WinDir\System32\Microsoft\Windows\PowerShell\DriveRoots\[UserName]
// WinDir\System32\Microsoft\PowerShell\DriveRoots\[UserName]
string directoryName = MakeUserNamePath();
#if UNIX
string userDrivePath = Path.Combine(Platform.SelectProductNameForDirectory(Platform.XDG_Type.CACHE), "DriveRoots", directoryName);
#else
string userDrivePath = Path.Combine(
Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
@"Microsoft\Windows\PowerShell\DriveRoots",
@"Microsoft\PowerShell\DriveRoots",
directoryName);
#endif

Expand Down
128 changes: 128 additions & 0 deletions test/powershell/Host/Startup.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License.

Describe "Validate start of console host" -Tag CI {
BeforeAll {
$allowedAssemblies = @(
'Microsoft.ApplicationInsights.dll'
'Microsoft.Management.Infrastructure.dll'
'Microsoft.PowerShell.ConsoleHost.dll'
'Microsoft.PowerShell.Security.dll'
'Microsoft.Win32.Primitives.dll'
'Microsoft.Win32.Registry.dll'
'netstandard.dll'
'Newtonsoft.Json.dll'
'pwsh.dll'
'System.Buffers.dll'
'System.Collections.Concurrent.dll'
'System.Collections.dll'
'System.Collections.NonGeneric.dll'
'System.Collections.Specialized.dll'
'System.ComponentModel.dll'
'System.ComponentModel.Primitives.dll'
'System.ComponentModel.TypeConverter.dll'
'System.Console.dll'
'System.Data.Common.dll'
'System.Diagnostics.Debug.dll'
'System.Diagnostics.FileVersionInfo.dll'
'System.Diagnostics.Process.dll'
'System.Diagnostics.Tools.dll'
'System.Diagnostics.TraceSource.dll'
'System.Diagnostics.Tracing.dll'
'System.Globalization.dll'
'System.IO.FileSystem.AccessControl.dll'
'System.IO.FileSystem.dll'
'System.IO.FileSystem.DriveInfo.dll'
'System.IO.Pipes.dll'
'System.Linq.dll'
'System.Linq.Expressions.dll'
'System.Management.Automation.dll'
'System.Memory.dll'
'System.Net.Mail.dll'
'System.Net.NetworkInformation.dll'
'System.Net.Primitives.dll'
'System.ObjectModel.dll'
'System.Private.CoreLib.dll'
'System.Private.Uri.dll'
'System.Private.Xml.dll'
'System.Private.Xml.Linq.dll'
'System.Reflection.dll'
'System.Reflection.Emit.ILGeneration.dll'
'System.Reflection.Emit.Lightweight.dll'
'System.Reflection.Extensions.dll'
'System.Reflection.Primitives.dll'
'System.Resources.ResourceManager.dll'
'System.Runtime.dll'
'System.Runtime.Extensions.dll'
'System.Runtime.InteropServices.dll'
'System.Runtime.InteropServices.RuntimeInformation.dll'
'System.Runtime.Loader.dll'
'System.Runtime.Numerics.dll'
'System.Runtime.Serialization.Formatters.dll'
'System.Runtime.Serialization.Primitives.dll'
'System.Security.AccessControl.dll'
'System.Security.Cryptography.Encoding.dll'
'System.Security.Cryptography.Primitives.dll'
'System.Security.Cryptography.X509Certificates.dll'
'System.Security.Principal.dll'
'System.Security.Principal.Windows.dll'
'System.Text.Encoding.Extensions.dll'
'System.Text.RegularExpressions.dll'
'System.Threading.dll'
'System.Threading.Tasks.dll'
'System.Threading.Tasks.Parallel.dll'
'System.Threading.Thread.dll'
'System.Threading.Timer.dll'
'System.Xml.ReaderWriter.dll'
'System.Xml.XDocument.dll'
)

if ($IsWindows) {
$allowedAssemblies += @(
'Microsoft.PowerShell.CoreCLR.Eventing.dll'
'System.DirectoryServices.dll'
'System.Management.dll'
'System.Security.Claims.dll'
'System.Threading.Overlapped.dll'
)
}
else {
$allowedAssemblies += @(
'System.Collections.Immutable.dll'
'System.IO.MemoryMappedFiles.dll'
'System.Net.Sockets.dll'
'System.Reflection.Metadata.dll'
)
}

if ($IsWindows) {
$profileDataFile = Join-Path $env:LOCALAPPDATA "Microsoft\PowerShell\StartupProfileData-NonInteractive"
} else {
$profileDataFile = Join-Path ([System.Management.Automation.Platform]::SelectProductNameForDirectory("CACHE")) "StartupProfileData-NonInteractive"
}

if (Test-Path $profileDataFile) {
Remove-Item $profileDataFile -Force
}

$loadedAssemblies = pwsh -noprofile -command '([System.AppDomain]::CurrentDomain.GetAssemblies()).manifestmodule | Where-Object { $_.Name -notlike ""<*>"" } | ForEach-Object { $_.Name }'
}

It "No new assemblies are loaded" {
$diffs = Compare-Object -ReferenceObject $allowedAssemblies -DifferenceObject $loadedAssemblies

if ($null -ne $diffs) {
$assembliesAllowedButNotLoaded = $diffs | Where-Object SideIndicator -eq "<=" | ForEach-Object InputObject
$assembliesLoadedButNotAllowed = $diffs | Where-Object SideIndicator -eq "=>" | ForEach-Object InputObject

if ($assembliesAllowedButNotLoaded) {
Write-Host ("Assemblies that are expected but not loaded: {0}" -f ($assembliesAllowedButNotLoaded -join ", "))
}
if ($assembliesLoadedButNotAllowed) {
Write-Host ("Assemblies that are loaded but not expected: {0}" -f ($assembliesLoadedButNotAllowed -join ", "))
}
}

$diffs | Should -BeExactly $null
}
}