Merge branch '0.0' into 2.0

This commit is contained in:
terrafrost 2021-08-24 20:19:18 -05:00
commit ea4b75f165

View File

@ -269,6 +269,21 @@ class SFTP extends SSH2
*/ */
var $preserveTime = false; var $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? * Was the last packet due to the channels being closed or not?
* *
@ -644,6 +659,16 @@ class SFTP extends SSH2
$this->canonicalize_paths = true; $this->canonicalize_paths = true;
} }
/**
* Enable arbitrary length packets
*
* @access public
*/
function enableArbitraryLengthPackets()
{
$this->allow_arbitrary_length_packets = true;
}
/** /**
* Enable path canonicalization * Enable path canonicalization
* *
@ -3126,7 +3151,7 @@ class SFTP extends SSH2
// 256 * 1024 is what SFTP_MAX_MSG_LENGTH is set to in OpenSSH's sftp-common.h // 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) {
user_error('Invalid SFTP packet size'); user_error('Invalid SFTP packet size');
return false; return false;
} }