octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2025-01-14 10:53:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.0' into 2.0

Browse Source
This commit is contained in:
terrafrost 2022-12-23 10:16:52 -06:00
commit aa68ee7e69
2 changed files with 50 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
phpseclib/Net/SFTP.php
View File

@ -318,6 +318,38 @@ class SFTP extends SSH2
*/
var $partial_init = false;
/**
* http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-7.1
* the order, in this case, matters quite a lot - see \phpseclib3\Net\SFTP::_parseAttributes() to understand why
*
* @var array
* @access private
*/
var $attributes = array();
/**
* @var array
* @access private
*/
var $open_flags = array();
/**
* SFTPv5+ changed the flags up:
* https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-13#section-8.1.1.3
*
* @var array
* @access private
*/
var $open_flags5 = array();
/**
* http://tools.ietf.org/html/draft-ietf-secsh-filexfer-04#section-5.2
* see \phpseclib\Net\SFTP::_parseLongname() for an explanation
*
* @var array
*/
var $file_types = array();
/**
* Default Constructor.
*

20
phpseclib/Net/SSH1.php
View File

@ -205,6 +205,10 @@ class SSH1
* Dumps the content real-time to a file
*/
const LOG_REALTIME_FILE = 4;
/**
* Make sure that the log never gets larger than this
*/
const LOG_MAX_SIZE = 1048576; // 1024 * 1024
/**#@-*/
/**#@+
@ -360,7 +364,7 @@ class SSH1
* @var array
* @access private
*/
var $protocol_flag_log = array();
var $protocol_flags_log = array();
/**
* Message Log
@ -407,6 +411,18 @@ class SSH1
*/
var $interactiveBuffer = '';
/**
* Current log size
*
* Should never exceed self::LOG_MAX_SIZE
*
* @see self::_send_binary_packet()
* @see self::_get_binary_packet()
* @var int
* @access private
*/
var $log_size;
/**
* Timeout
*
@ -1418,7 +1434,7 @@ class SSH1
switch (NET_SSH1_LOGGING) {
case self::LOG_SIMPLE:
return $this->message_number_log;
return $this->protocol_flags_log;
break;
case self::LOG_COMPLEX:
return $this->_format_log($this->message_log, $this->protocol_flags_log);