Skip to content

Support Get-PSHostProcessInfo and Enter-PSHostProcess on non-Windows #8232

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 14 commits into from
Nov 15, 2018
Merged

Support Get-PSHostProcessInfo and Enter-PSHostProcess on non-Windows #8232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6b917a0
initial code to add UNIX path to named pipes
SteveL-MSFT Nov 10, 2018
9b54fd2
fix codefactor and test failure
SteveL-MSFT Nov 11, 2018
589c644
remove unnecessary legacy Windows specific doe
Nov 12, 2018
2504dd9
[feature]
SteveL-MSFT Nov 12, 2018
33f6254
address Ilya's feedback, some minor cleanup
SteveL-MSFT Nov 12, 2018
60f2f7d
[feature]
SteveL-MSFT Nov 12, 2018
f2a9c04
[feature]
SteveL-MSFT Nov 12, 2018
37d076c
[feature]
SteveL-MSFT Nov 12, 2018
28ed305
[feature]
SteveL-MSFT Nov 12, 2018
c32a657
[feature]
SteveL-MSFT Nov 13, 2018
6cbc498
[feature]
SteveL-MSFT Nov 14, 2018
6d46bad
Remove extra new lines
daxian-dbw Nov 14, 2018
f08bf2a
[feature]
Nov 14, 2018
1f26306
[feature]
Nov 15, 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
1 change: 0 additions & 1 deletion src/System.Management.Automation/System.Management.Automation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@
<Compile Remove="engine\remoting\commands\ConnectPSSession.cs" />
<Compile Remove="engine\remoting\commands\CustomShellCommands.cs" />
<Compile Remove="engine\remoting\commands\DisconnectPSSession.cs" />
<Compile Remove="engine\remoting\commands\EnterPSHostProcessCommand.cs" />
<Compile Remove="engine\remoting\commands\NewPSSessionOptionCommand.cs" />
<Compile Remove="engine\remoting\commands\ReceivePSSession.cs" />
<Compile Remove="engine\remoting\commands\TestPSSessionConfigurationFile.cs" />
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 @@ -5243,9 +5243,6 @@ private static void InitializeCoreCmdletsAndProviders(
#if !UNIX
{"Disable-PSRemoting", new SessionStateCmdletEntry("Disable-PSRemoting", typeof(DisablePSRemotingCommand), helpFile) },
{"Enable-PSRemoting", new SessionStateCmdletEntry("Enable-PSRemoting", typeof(EnablePSRemotingCommand), helpFile) },
{"Get-PSHostProcessInfo", new SessionStateCmdletEntry("Get-PSHostProcessInfo", typeof(GetPSHostProcessInfoCommand), helpFile) },
{"Enter-PSHostProcess", new SessionStateCmdletEntry("Enter-PSHostProcess", typeof(EnterPSHostProcessCommand), helpFile) },
{"Exit-PSHostProcess", new SessionStateCmdletEntry("Exit-PSHostProcess", typeof(ExitPSHostProcessCommand), helpFile) },
{"Disable-PSSessionConfiguration", new SessionStateCmdletEntry("Disable-PSSessionConfiguration", typeof(DisablePSSessionConfigurationCommand), helpFile) },
{"Enable-PSSessionConfiguration", new SessionStateCmdletEntry("Enable-PSSessionConfiguration", typeof(EnablePSSessionConfigurationCommand), helpFile) },
{"Get-PSSessionCapability", new SessionStateCmdletEntry("Get-PSSessionCapability", typeof(GetPSSessionCapabilityCommand), helpFile) },
Expand All @@ -5260,7 +5257,9 @@ private static void InitializeCoreCmdletsAndProviders(
{"Connect-PSSession", new SessionStateCmdletEntry("Connect-PSSession", typeof(ConnectPSSessionCommand), helpFile) },
{"Disconnect-PSSession", new SessionStateCmdletEntry("Disconnect-PSSession", typeof(DisconnectPSSessionCommand), helpFile) },
#endif
{"Enter-PSHostProcess", new SessionStateCmdletEntry("Enter-PSHostProcess", typeof(EnterPSHostProcessCommand), helpFile) },
{"Enter-PSSession", new SessionStateCmdletEntry("Enter-PSSession", typeof(EnterPSSessionCommand), helpFile) },
{"Exit-PSHostProcess", new SessionStateCmdletEntry("Exit-PSHostProcess", typeof(ExitPSHostProcessCommand), helpFile) },
{"Exit-PSSession", new SessionStateCmdletEntry("Exit-PSSession", typeof(ExitPSSessionCommand), helpFile) },
{"Export-ModuleMember", new SessionStateCmdletEntry("Export-ModuleMember", typeof(ExportModuleMemberCommand), helpFile) },
{"ForEach-Object", new SessionStateCmdletEntry("ForEach-Object", typeof(ForEachObjectCommand), helpFile) },
Expand All @@ -5270,6 +5269,7 @@ private static void InitializeCoreCmdletsAndProviders(
{"Get-History", new SessionStateCmdletEntry("Get-History", typeof(GetHistoryCommand), helpFile) },
{"Get-Job", new SessionStateCmdletEntry("Get-Job", typeof(GetJobCommand), helpFile) },
{"Get-Module", new SessionStateCmdletEntry("Get-Module", typeof(GetModuleCommand), helpFile) },
{"Get-PSHostProcessInfo", new SessionStateCmdletEntry("Get-PSHostProcessInfo", typeof(GetPSHostProcessInfoCommand), helpFile) },
{"Get-PSSession", new SessionStateCmdletEntry("Get-PSSession", typeof(GetPSSessionCommand), helpFile) },
{"Import-Module", new SessionStateCmdletEntry("Import-Module", typeof(ImportModuleCommand), helpFile) },
{"Invoke-Command", new SessionStateCmdletEntry("Invoke-Command", typeof(InvokeCommandCommand), helpFile) },
Expand Down
33 changes: 0 additions & 33 deletions src/System.Management.Automation/engine/Utils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -902,39 +902,6 @@ internal static bool IsAdministrator()
#endif
}

internal static void NativeEnumerateDirectory(string directory, out List<string> directories, out List<string> files)
{
IntPtr INVALID_HANDLE_VALUE = new IntPtr(-1);
NativeMethods.WIN32_FIND_DATA findData;

files = new List<string>();
directories = new List<string>();

IntPtr findHandle;

findHandle = NativeMethods.FindFirstFile(directory + "\\*", out findData);
if (findHandle != INVALID_HANDLE_VALUE)
{
do
{
if ((findData.dwFileAttributes & NativeMethods.FileAttributes.Directory) != 0)
{
if ((!String.Equals(".", findData.cFileName, StringComparison.OrdinalIgnoreCase)) &&
(!String.Equals("..", findData.cFileName, StringComparison.OrdinalIgnoreCase)))
{
directories.Add(directory + "\\" + findData.cFileName);
}
}
else
{
files.Add(directory + "\\" + findData.cFileName);
}
}
while (NativeMethods.FindNextFile(findHandle, out findData));
NativeMethods.FindClose(findHandle);
}
}

internal static bool IsReservedDeviceName(string destinationPath)
{
#if !UNIX
Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/engine/hostifaces/LocalConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,7 +823,7 @@ private void DoCloseHelper()
// When closing the primary runspace, ensure all other local runspaces are closed.
var closeAllOpenRunspaces = isPrimaryRunspace && haveOpenRunspaces;

// Stop all transcriptions and unitialize AMSI if we're the last runspace to exit or we are exiting the primary runspace.
// Stop all transcriptions and un-initialize AMSI if we're the last runspace to exit or we are exiting the primary runspace.
if (!haveOpenRunspaces)
{
ExecutionContext executionContext = this.GetExecutionContext;
Expand Down
70 changes: 56 additions & 14 deletions src/System.Management.Automation/engine/remoting/commands/EnterPSHostProcessCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,17 @@
// Licensed under the MIT License.

using System;
using System.Diagnostics;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using System.IO;
using System.Management.Automation;
using System.Management.Automation.Host;
using System.Management.Automation.Internal;
using System.Management.Automation.Runspaces;
using System.Management.Automation.Remoting;
using System.Diagnostics.CodeAnalysis;
using System.Management.Automation.Runspaces;

namespace Microsoft.PowerShell.Commands
{
Expand Down Expand Up @@ -393,7 +394,14 @@ public sealed class GetPSHostProcessInfoCommand : PSCmdlet
private const string ProcessParameterSet = "ProcessParameterSet";
private const string ProcessIdParameterSet = "ProcessIdParameterSet";
private const string ProcessNameParameterSet = "ProcessNameParameterSet";

#if UNIX
// CoreFx uses the system temp path to store the file used for named pipes and is not settable.
// This member is only used by Get-PSHostProcessInfo to know where to look for the named pipe files.
private static readonly string NamedPipePath = Path.GetTempPath();
#else
private const string NamedPipePath = @"\\.\pipe\";
#endif

#endregion

Expand Down Expand Up @@ -524,24 +532,26 @@ internal static IReadOnlyCollection<PSHostProcessInfo> GetAppDomainNamesFromProc
var procAppDomainInfo = new List<PSHostProcessInfo>();

// Get all named pipe 'files' on local machine.
List<string> directories;
List<string> namedPipes;
Utils.NativeEnumerateDirectory(NamedPipePath, out directories, out namedPipes);
List<string> namedPipes = new List<string>();
var namedPipeDirectory = new DirectoryInfo(NamedPipePath);
foreach (var pipeFileInfo in namedPipeDirectory.EnumerateFiles(NamedPipeUtils.NamedPipeNamePrefixSearch))
{
namedPipes.Add(Path.Combine(pipeFileInfo.DirectoryName, pipeFileInfo.Name));
}

// Collect all PowerShell named pipes for given process Ids.
foreach (string namedPipe in namedPipes)
{
int startIndex = namedPipe.IndexOf(NamedPipeUtils.NamedPipeNamePrefix, StringComparison.OrdinalIgnoreCase);
if (startIndex > -1)
{
// This is a PowerShell named pipe. Parse the process Id, AppDomain name, and process name.
int pStartTimeIndex = namedPipe.IndexOf(".", startIndex, StringComparison.OrdinalIgnoreCase);
int pStartTimeIndex = namedPipe.IndexOf('.', startIndex);
if (pStartTimeIndex > -1)
{
int pIdIndex = namedPipe.IndexOf(".", pStartTimeIndex + 1, StringComparison.OrdinalIgnoreCase);
int pIdIndex = namedPipe.IndexOf('.', pStartTimeIndex + 1);
if (pIdIndex > -1)
{
int pAppDomainIndex = namedPipe.IndexOf(".", pIdIndex + 1, StringComparison.OrdinalIgnoreCase);
int pAppDomainIndex = namedPipe.IndexOf('.', pIdIndex + 1);
if (pAppDomainIndex > -1)
{
string idString = namedPipe.Substring(pIdIndex + 1, (pAppDomainIndex - pIdIndex - 1));
Expand All @@ -564,15 +574,47 @@ internal static IReadOnlyCollection<PSHostProcessInfo> GetAppDomainNamesFromProc
if (!found) { continue; }
}
}
else
{
// Process id is not valid so we'll skip
continue;
}

int pNameIndex = namedPipe.IndexOf(".", pAppDomainIndex + 1, StringComparison.OrdinalIgnoreCase);
int pNameIndex = namedPipe.IndexOf('.', pAppDomainIndex + 1);
if (pNameIndex > -1)
{
string appDomainName = namedPipe.Substring(pAppDomainIndex + 1, (pNameIndex - pAppDomainIndex - 1));
string pName = namedPipe.Substring(pNameIndex + 1);

procAppDomainInfo.Add(
new PSHostProcessInfo(pName, id, appDomainName));
Process process = null;

try
{
process = System.Diagnostics.Process.GetProcessById(id);
}
catch (Exception)
{
// Do nothing if the process no longer exists
}

if (process == null)
{
try
{
// If the process is gone, try removing the PSHost named pipe
var pipeFile = new FileInfo(namedPipe);
pipeFile.Delete();
}
catch (Exception)
{
// best effort to cleanup
}
}
else if (process.ProcessName.Equals(pName, StringComparison.Ordinal))
{
// only add if the process name matches
procAppDomainInfo.Add(new PSHostProcessInfo(pName, id, appDomainName));
}
}
}
}
Expand Down Expand Up @@ -661,7 +703,7 @@ internal PSHostProcessInfo(string processName, int processId, string appDomainNa
MainWindowTitle = String.Empty;
try
{
var proc = System.Diagnostics.Process.GetProcessById(processId);
var proc = Process.GetProcessById(processId);
MainWindowTitle = proc.MainWindowTitle ?? string.Empty;
}
catch (ArgumentException) { }
Expand Down
Loading