octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-11-16 02:07:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

SFTP: make posix_rename work on SFTP v5+

Browse Source
This commit is contained in:
terrafrost 2024-09-15 13:33:51 -05:00
parent 5ec2d25ed4
commit 79ab7c1f8e
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
phpseclib/Net/SFTP.php
View File

@ -3590,7 +3590,9 @@ class SFTP extends SSH2
if (!$this->precheck()) { if (!$this->precheck()) {
return false; return false;
} }
if (!isset($this->extensions['posix-rename@openssh.com']) || $this->extensions['posix-rename@openssh.com'] !== '1') { $testA = $this->version >= 5;
$testB = isset($this->extensions['posix-rename@openssh.com']) && $this->extensions['posix-rename@openssh.com'] === '1';
if (!$testA && !$testB) {
throw new \RuntimeException( throw new \RuntimeException(
"Extension 'posix-rename@openssh.com' is not supported by the server. " . "Extension 'posix-rename@openssh.com' is not supported by the server. " .
"Call getSupportedVersions() to see a list of supported extension" "Call getSupportedVersions() to see a list of supported extension"
@ -3603,15 +3605,18 @@ class SFTP extends SSH2
return false; return false;
} }
if ($this->version >= 5) {
$packet = Strings::packSSH2('ssN', $oldname, $newname, 2); // 2 = SSH_FXP_RENAME_ATOMIC
$this->send_sftp_packet(NET_SFTP_RENAME, $packet);
} else {
$packet = Strings::packSSH2('sss', 'posix-rename@openssh.com', $oldname, $newname); $packet = Strings::packSSH2('sss', 'posix-rename@openssh.com', $oldname, $newname);
$this->send_sftp_packet(NET_SFTP_EXTENDED, $packet); $this->send_sftp_packet(NET_SFTP_EXTENDED, $packet);
}
$response = $this->get_sftp_packet(); $response = $this->get_sftp_packet();
if ($this->packet_type != NET_SFTP_STATUS) { if ($this->packet_type != NET_SFTP_STATUS) {
throw new \UnexpectedValueException( throw new \UnexpectedValueException('Expected NET_SFTP_STATUS. '
'Expected NET_SFTP_STATUS. ' . 'Got packet type: ' . $this->packet_type);
. 'Got packet type: ' . $this->packet_type
);
} }
// if $status isn't SSH_FX_OK it's probably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED // if $status isn't SSH_FX_OK it's probably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED