octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2025-01-15 19:16:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.0'

Browse Source
This commit is contained in:
terrafrost 2022-06-16 17:57:28 -05:00
commit 545b43cd70
1 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
phpseclib/Net/SFTP.php
View File

@ -41,6 +41,7 @@ use phpseclib3\Net\SFTP\OpenFlag;
use phpseclib3\Net\SFTP\OpenFlag5; use phpseclib3\Net\SFTP\OpenFlag5;
use phpseclib3\Net\SFTP\PacketType as SFTPPacketType; use phpseclib3\Net\SFTP\PacketType as SFTPPacketType;
use phpseclib3\Net\SFTP\StatusCode; use phpseclib3\Net\SFTP\StatusCode;
use phpseclib3\Net\SSH2\DisconnectReason;
use phpseclib3\Net\SSH2\MessageType as SSH2MessageType; use phpseclib3\Net\SSH2\MessageType as SSH2MessageType;
/** /**
@ -509,7 +510,15 @@ class SFTP extends SSH2
} }
$this->pwd = true; $this->pwd = true;
try {
$this->pwd = $this->realpath('.'); $this->pwd = $this->realpath('.');
} catch (\UnexpectedValueException $e) {
if (!$this->canonicalize_paths) {
throw $e;
}
$this->$this->canonicalize_paths = false;
$this->reset_connection(DisconnectReason::CONNECTION_LOST);
}
$this->update_stat_cache($this->pwd, []); $this->update_stat_cache($this->pwd, []);
@ -553,7 +562,9 @@ class SFTP extends SSH2
} }
/** /**
* Enable path canonicalization * Disable path canonicalization
*
* If this is enabled then $sftp->pwd() will not return the canonicalized absolute path
* *
*/ */
public function disablePathCanonicalization() public function disablePathCanonicalization()
@ -636,7 +647,32 @@ class SFTP extends SSH2
} }
if (!$this->canonicalize_paths) { if (!$this->canonicalize_paths) {
return $path; if ($this->pwd === true) {
return '.';
}
if (!strlen($path) || $path[0] != '/') {
$path = $this->pwd . '/' . $path;
}
$parts = explode('/', $path);
$afterPWD = $beforePWD = [];
foreach ($parts as $part) {
switch ($part) {
//case '': // some SFTP servers /require/ double /'s. see https://github.com/phpseclib/phpseclib/pull/1137
case '.':
break;
case '..':
if (!empty($afterPWD)) {
array_pop($afterPWD);
} else {
$beforePWD[] = '..';
}
break;
default:
$afterPWD[] = $part;
}
}
$beforePWD = count($beforePWD) ? implode('/', $beforePWD) : '.';
return $beforePWD . '/' . implode('/', $afterPWD);
} }
if ($this->pwd === true) { if ($this->pwd === true) {