Fix for SSH remoting when SSH client abruptly terminates - #4123
Fix for SSH remoting when SSH client abruptly terminates#4123Mike Richmond (mirichmo) merged 4 commits into
Conversation
Sorry, something went wrong.
| <data name="InvalidRoleCapabilityFileExtension" xml:space="preserve"> | ||
| <value>The provided role capability file {0} does not have the required .psrc extension.</value> | ||
| </data> | ||
| <data name="SSHTerminated" > |
There was a problem hiding this comment.
Maybe SSHAbruptlyTerminated ?
Sorry, something went wrong.
There was a problem hiding this comment.
Sure, will change.
Sorry, something went wrong.
| if (string.IsNullOrEmpty(error) || | ||
| if (error == null) | ||
| { | ||
| return error; |
There was a problem hiding this comment.
Why did you decide to return null here and throw in the calling function? Why not just throw here and make the ReadError() function always return non-null strings?
Sorry, something went wrong.
There was a problem hiding this comment.
No special reason except that I think of ReadError() helper method as a wrapper to StreamReader. But I agree that it would be cleaner to just throw in ReadError()
Sorry, something went wrong.
|
Ilya (@iSazonov) Do you have any additional comments or concerns? |
Sorry, something went wrong.
|
LGTM. |
Sorry, something went wrong.
…4123) * Fix for SSH remoting when SSH client abruptly terminates * Put error message in localizable string resource * Renamed error string per code review request * Removed extra error==null check
This PR is for Issue #4122
If the SSH client process that PowerShell is using for the SSH transport terminates abruptly the StreamReader will return null instead of closing the pipe for a normal process exit.
The current error stream reading code ignores null StreamReader values resulting in a hang where the remote session never ends.
Fix is to throw an error when this occurs.