danog/phpseclib
1
0
Fork 0
mirror of https://github.com/danog/phpseclib.git synced 2024-12-11 16:49:42 +01:00
Code Issues Projects Releases Wiki Activity

update symlink

Browse Source
This commit is contained in:
terrafrost 2021-09-08 09:34:16 -05:00
parent 41b5f7cfe9
commit ced7dab1d5
1 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
phpseclib/Net/SFTP.php
View File

@ -380,6 +380,7 @@ class Net_SFTP extends Net_SSH2
18 => 'NET_SFTP_RENAME', 18 => 'NET_SFTP_RENAME',
19 => 'NET_SFTP_READLINK', 19 => 'NET_SFTP_READLINK',
20 => 'NET_SFTP_SYMLINK', 20 => 'NET_SFTP_SYMLINK',
21 => 'NET_SFTP_LINK',
101=> 'NET_SFTP_STATUS', 101=> 'NET_SFTP_STATUS',
102=> 'NET_SFTP_HANDLE', 102=> 'NET_SFTP_HANDLE',
@ -1947,13 +1948,6 @@ class Net_SFTP extends Net_SSH2
*/ */
function symlink($target, $link) function symlink($target, $link)
{ {
/*
SFTP v6 changes (from v5)
o Changed the SYMLINK packet to be LINK and give it the ability to
create hard links. Also change it's packet number because many
implementation implemented SYMLINK with the arguments reversed.
Hopefully the new argument names make it clear which way is which.
*/
if (!$this->_precheck()) { if (!$this->_precheck()) {
return false; return false;
} }
@ -1961,8 +1955,37 @@ SFTP v6 changes (from v5)
//$target = $this->_realpath($target); //$target = $this->_realpath($target);
$link = $this->_realpath($link); $link = $this->_realpath($link);
$packet = pack('Na*Na*', strlen($target), $target, strlen($link), $link); /* quoting https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-09#section-12.1 :
if (!$this->_send_sftp_packet(NET_SFTP_SYMLINK, $packet)) {
Changed the SYMLINK packet to be LINK and give it the ability to
create hard links. Also change it's packet number because many
implementation implemented SYMLINK with the arguments reversed.
Hopefully the new argument names make it clear which way is which.
*/
if ($this->version == 6) {
$type = NET_SFTP_LINK;
$packet = pack('Na*Na*C', strlen($link), $link, strlen($target), $target, 1);
} else {
$type = NET_SFTP_SYMLINK;
/* quoting http://bxr.su/OpenBSD/usr.bin/ssh/PROTOCOL#347 :
3.1. sftp: Reversal of arguments to SSH_FXP_SYMLINK
When OpenSSH's sftp-server was implemented, the order of the arguments
to the SSH_FXP_SYMLINK method was inadvertently reversed. Unfortunately,
the reversal was not noticed until the server was widely deployed. Since
fixing this to follow the specification would cause incompatibility, the
current order was retained. For correct operation, clients should send
SSH_FXP_SYMLINK as follows:
uint32 id
string targetpath
string linkpath */
$packet = substr($this->server_identifier, 0, 13) == 'SSH-2.0-OpenSSH' ?
pack('Na*Na*', strlen($target), $target, strlen($link), $link) :
pack('Na*Na*', strlen($link), $link, strlen($target), $target);
}
if (!$this->_send_sftp_packet($type, $packet)) {
return false; return false;
} }
@ -3506,7 +3529,6 @@ SFTP v6 changes (from v5)
$tempLength = $length; $tempLength = $length;
$tempLength-= strlen($this->packet_buffer); $tempLength-= strlen($this->packet_buffer);
// 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->use_request_id && $tempLength > 256 * 1024) {
user_error('Invalid SFTP packet size'); user_error('Invalid SFTP packet size');