Skip to content

Retrieve productVersion using informational version attribute in AmsiUtils.Init() #15527

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 5 commits into from
Jun 14, 2021
Merged

Retrieve productVersion using informational version attribute in AmsiUtils.Init() #15527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7becb92
Expose assembly informational version in PSVersionInfo
Fs00 Jun 5, 2021
6ee1c74
Use PSVersionInfo.ProductVersion in AmsiUtils.Init
Fs00 Jun 6, 2021
121f744
Rename hostname local variable
Fs00 Jun 10, 2021
2576020
Handle exceptions coming from Environment.ProcessPath
Fs00 Jun 11, 2021
38a0e4f
Add a comment
daxian-dbw Jun 14, 2021
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
10 changes: 6 additions & 4 deletions src/System.Management.Automation/engine/PSVersionInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ static PSVersionInfo()
s_psVersionTable = new PSVersionHashTable(StringComparer.OrdinalIgnoreCase);

Assembly currentAssembly = typeof(PSVersionInfo).Assembly;
string productVersion = currentAssembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion;
ProductVersion = currentAssembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion;

// Get 'GitCommitId' and 'PSVersion' from the 'productVersion' assembly attribute.
//
Expand All @@ -93,11 +93,11 @@ static PSVersionInfo()
// productVersion = '6.0.0 SHA: f1ec9...' convert to GitCommitId = 'v6.0.0'
// PSVersion = '6.0.0'
string rawGitCommitId;
string mainVersion = productVersion.Substring(0, productVersion.IndexOf(' '));
string mainVersion = ProductVersion.Substring(0, ProductVersion.IndexOf(' '));

if (productVersion.Contains(" Commits: "))
if (ProductVersion.Contains(" Commits: "))
{
rawGitCommitId = productVersion.Replace(" Commits: ", "-").Replace(" SHA: ", "-g");
rawGitCommitId = ProductVersion.Replace(" Commits: ", "-").Replace(" SHA: ", "-g");
}
else
{
Expand Down Expand Up @@ -182,6 +182,8 @@ public static Version PSVersion
}
}

internal static string ProductVersion { get; }

internal static string GitCommitId
{
get
Expand Down
26 changes: 7 additions & 19 deletions src/System.Management.Automation/security/SecuritySupport.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1336,39 +1336,27 @@ public enum ResolutionPurpose

internal static class AmsiUtils
{
private static string GetProcessHostName(string processName)
{
return string.Concat("PowerShell_", processName, ".exe_0.0.0.0");
}

internal static int Init()
{
Diagnostics.Assert(s_amsiContext == IntPtr.Zero, "Init should be called just once");

lock (s_amsiLockObject)
{
Process currentProcess = Process.GetCurrentProcess();
string hostname;
string appName;
try
{
hostname = string.Concat("PowerShell_", Environment.ProcessPath, "_",
currentProcess.MainModule.FileVersionInfo.ProductVersion);
}
catch (ComponentModel.Win32Exception)
{
// This exception can be thrown during thread impersonation (Access Denied for process module access).
hostname = GetProcessHostName(currentProcess.ProcessName);
appName = string.Concat("PowerShell_", Environment.ProcessPath, "_", PSVersionInfo.ProductVersion);
}
catch (FileNotFoundException)
catch (Exception)
{
// This exception can occur if the file is renamed or moved to some other folder
// (This has occurred during Exchange set up).
hostname = GetProcessHostName(currentProcess.ProcessName);
// Fall back to 'Process.ProcessName' in case 'Environment.ProcessPath' throws exception.
Process currentProcess = Process.GetCurrentProcess();
appName = string.Concat("PowerShell_", currentProcess.ProcessName, ".exe_", PSVersionInfo.ProductVersion);
}

AppDomain.CurrentDomain.ProcessExit += CurrentDomain_ProcessExit;

var hr = AmsiNativeMethods.AmsiInitialize(hostname, ref s_amsiContext);
var hr = AmsiNativeMethods.AmsiInitialize(appName, ref s_amsiContext);
if (!Utils.Succeeded(hr))
{
s_amsiInitFailed = true;
Expand Down
1 change: 0 additions & 1 deletion test/powershell/Host/Startup.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ Describe "Validate start of console host" -Tag CI {
if ($IsWindows) {
$allowedAssemblies += @(
'Microsoft.PowerShell.CoreCLR.Eventing.dll'
'System.Diagnostics.FileVersionInfo.dll'
'System.DirectoryServices.dll'
'System.Management.dll'
'System.Security.Claims.dll'
Expand Down