Merge branch '2.0' into 3.0

This commit is contained in:
terrafrost 2021-08-24 20:20:20 -05:00
commit 9db03e1536

View File

@ -284,6 +284,21 @@ class SFTP extends SSH2
*/
private $preserveTime = false;
/**
* Arbitrary Length Packets Flag
*
* Determines whether or not packets of any length should be allowed,
* in cases where the server chooses the packet length (such as
* directory listings). By default, packets are only allowed to be
* 256 * 1024 bytes (SFTP_MAX_MSG_LENGTH from OpenSSH's sftp-common.h)
*
* @see self::enableArbitraryLengthPackets()
* @see self::_get_sftp_packet()
* @var bool
* @access private
*/
var $allow_arbitrary_length_packets = false;
/**
* Was the last packet due to the channels being closed or not?
*
@ -633,6 +648,16 @@ class SFTP extends SSH2
$this->canonicalize_paths = true;
}
/**
* Enable arbitrary length packets
*
* @access public
*/
function enableArbitraryLengthPackets()
{
$this->allow_arbitrary_length_packets = true;
}
/**
* Enable path canonicalization
*
@ -2964,7 +2989,7 @@ class SFTP extends SSH2
$tempLength-= strlen($this->packet_buffer);
// 256 * 1024 is what SFTP_MAX_MSG_LENGTH is set to in OpenSSH's sftp-common.h
if (!$this->use_request_id && $tempLength > 256 * 1024) {
if (!$this->allow_arbitrary_length_packets && !$this->use_request_id && $tempLength > 256 * 1024) {
throw new \RuntimeException('Invalid Size');
}