danog/phpseclib
1
0
Fork 0
mirror of https://github.com/danog/phpseclib.git synced 2024-12-13 09:37:37 +01:00
Code Issues Projects Releases Wiki Activity

SSH2: close channel and break after exit-signal

Browse Source 
Prior to efdec7b118 exit-signal's would re-use exit-status's channel closing code. after that commit, however, exit-status specific code was added, which meant that falling through, without the break, broke things
This commit is contained in:
terrafrost 2013-06-10 10:57:34 -05:00
parent 3c39e89bf8
commit d79ce65fe3
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
phpseclib/Net/SSH2.php
View File

@ -2694,6 +2694,13 @@ class Net_SSH2 {
if ($length) { if ($length) {
$this->errors[count($this->errors)].= "\r\n" . $this->_string_shift($response, $length); $this->errors[count($this->errors)].= "\r\n" . $this->_string_shift($response, $length);
} }
$this->_send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_EOF, $this->server_channels[$client_channel]));
$this->_send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_CLOSE, $this->server_channels[$channel]));
$this->channel_status[$channel] = NET_SSH2_MSG_CHANNEL_EOF;
break;
case 'exit-status': case 'exit-status':
extract(unpack('Cfalse/Nexit_status', $this->_string_shift($response, 5))); extract(unpack('Cfalse/Nexit_status', $this->_string_shift($response, 5)));
$this->exit_status = $exit_status; $this->exit_status = $exit_status;
@ -2703,6 +2710,8 @@ class Net_SSH2 {
$this->_send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_CLOSE, $this->server_channels[$channel])); $this->_send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_CLOSE, $this->server_channels[$channel]));
$this->channel_status[$channel] = NET_SSH2_MSG_CHANNEL_EOF; $this->channel_status[$channel] = NET_SSH2_MSG_CHANNEL_EOF;
break;
default: default:
// "Some systems may not implement signals, in which case they SHOULD ignore this message." // "Some systems may not implement signals, in which case they SHOULD ignore this message."
// -- http://tools.ietf.org/html/rfc4254#section-6.9 // -- http://tools.ietf.org/html/rfc4254#section-6.9