From dab514faffcc1adc5d34078b2e0804add1f90e4c Mon Sep 17 00:00:00 2001 From: Nick Lassonde Date: Mon, 26 Jul 2021 11:35:56 -0700 Subject: [PATCH 1/2] timeout in _get_channel_packet during _init_sftp_connection should be a failure --- phpseclib/Net/SFTP.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/phpseclib/Net/SFTP.php b/phpseclib/Net/SFTP.php index ef74dcae..873cf884 100644 --- a/phpseclib/Net/SFTP.php +++ b/phpseclib/Net/SFTP.php @@ -526,6 +526,8 @@ class Net_SFTP extends Net_SSH2 $response = $this->_get_channel_packet(NET_SFTP_CHANNEL, true); if ($response === false) { return false; + } else if ($response === true && $this->isTimeout()) { + return false; } $packet = pack( @@ -572,6 +574,8 @@ class Net_SFTP extends Net_SSH2 if ($response === false) { return false; } + } else if ($response === true && $this->isTimeout()) { + return false; } $this->channel_status[NET_SFTP_CHANNEL] = NET_SSH2_MSG_CHANNEL_DATA; From 0ec9d2bdf132a56184287cec8e2ebd8dc14f183a Mon Sep 17 00:00:00 2001 From: terrafrost Date: Wed, 28 Jul 2021 20:33:52 -0500 Subject: [PATCH 2/2] SFTP: CS adjustments --- phpseclib/Net/SFTP.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpseclib/Net/SFTP.php b/phpseclib/Net/SFTP.php index 873cf884..4aa44613 100644 --- a/phpseclib/Net/SFTP.php +++ b/phpseclib/Net/SFTP.php @@ -526,7 +526,7 @@ class Net_SFTP extends Net_SSH2 $response = $this->_get_channel_packet(NET_SFTP_CHANNEL, true); if ($response === false) { return false; - } else if ($response === true && $this->isTimeout()) { + } elseif ($response === true && $this->isTimeout()) { return false; } @@ -574,7 +574,7 @@ class Net_SFTP extends Net_SSH2 if ($response === false) { return false; } - } else if ($response === true && $this->isTimeout()) { + } elseif ($response === true && $this->isTimeout()) { return false; }