Skip to content

Fix for SSH remoting when SSH client abruptly terminates #4123

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
mirichmo merged 4 commits into from
Jun 29, 2017
Merged

Fix for SSH remoting when SSH client abruptly terminates #4123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9e4872c
Fix for SSH remoting when SSH client abruptly terminates
PaulHigin Jun 27, 2017
8c89102
Put error message in localizable string resource
PaulHigin Jun 27, 2017
a060e3f
Renamed error string per code review request
PaulHigin Jun 28, 2017
67e48be
Removed extra error==null check
PaulHigin Jun 28, 2017
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
16 changes: 14 additions & 2 deletions src/System.Management.Automation/engine/remoting/fanin/OutOfProcTransportManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1511,8 +1511,10 @@ private void ProcessErrorThread(object state)
while (true)
{
string error = ReadError(reader);
if (string.IsNullOrEmpty(error))

if (error.Length == 0)
{
// Ignore
continue;
}

Expand All @@ -1524,6 +1526,10 @@ private void ProcessErrorThread(object state)
HandleSSHError(psrte);
}
}
catch (ObjectDisposedException)
{
// Normal reader thread end.
}
catch (Exception e)
{
string errorMsg = (e.Message != null) ? e.Message : string.Empty;
Expand All @@ -1548,7 +1554,13 @@ private static string ReadError(StreamReader reader)
// Blocking read from StdError stream
string error = reader.ReadLine();

if (string.IsNullOrEmpty(error) ||
if (error == null)
{
// Stream is closed unexpectedly.
throw new PSInvalidOperationException(RemotingErrorIdStrings.SSHAbruptlyTerminated);
}

if ((error.Length == 0) ||
error.IndexOf("WARNING:", StringComparison.OrdinalIgnoreCase) > -1)
{
// Handle as interactive warning message
Expand Down
3 changes: 3 additions & 0 deletions src/System.Management.Automation/resources/RemotingErrorIdStrings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1636,4 +1636,7 @@ All WinRM sessions connected to Windows PowerShell session configurations, such
<data name="InvalidRoleCapabilityFileExtension" xml:space="preserve">
<value>The provided role capability file {0} does not have the required .psrc extension.</value>
</data>
<data name="SSHAbruptlyTerminated" >
<value>The SSH transport process has abruptly terminated causing this remote session to break.</value>
</data>
</root>