danog/tgseclib
1
0
Fork 0
mirror of https://github.com/danog/tgseclib.git synced 2025-01-22 05:51:20 +01:00
Code Issues Projects Releases Wiki Activity

Ensure SFTP::rawlist gives same results regardless of statcache

Browse Source 
Previously SFTP::rawlist gave different results depending on whether the
stat cache was enabled or not. With the stat cache turned off it did not
treat directories correctly, as it relied on the stat cache even though
it was not populated.
This commit is contained in:
Dean Sas 2018-08-13 16:28:33 +01:00 committed by terrafrost
parent 66f6d517da
commit 426dbdbfcd
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
phpseclib/Net/SFTP.php
View File

@ -919,7 +919,17 @@ class Net_SFTP extends Net_SSH2
unset($files[$key]);
continue;
}
if ($key != '.' && $key != '..' && is_array($this->_query_stat_cache($this->_realpath($dir . '/' . $key)))) {
$is_directory = false;
if ($key != '.' && $key != '..') {
if ($this->use_stat_cache) {
$is_directory = is_array($this->_query_stat_cache($this->_realpath($dir . '/' . $key)));
} else {
$stat = $this->stat($dir . '/' . $key);
$is_directory = $stat && $stat['type'] === NET_SFTP_TYPE_DIRECTORY;
}
}
if ($is_directory) {
$depth++;
$files[$key] = $this->rawlist($dir . '/' . $key, true);
$depth--;

27
tests/Functional/Net/SFTPUserStoryTest.php
View File

@ -722,5 +722,32 @@ class Functional_Net_SFTPUserStoryTest extends PhpseclibFunctionalTestCase
$sftp->exec('ping google.com -c 5');
sleep(5);
$sftp->nlist();
return $sftp;
}
/**
* @depends testExecNlist
*/
public function testRawlistDisabledStatCache($sftp)
{
$this->assertTrue($sftp->chdir('unittests'));
$this->assertTrue($sftp->mkdir(self::$scratchDir));
$this->assertTrue($sftp->chdir(self::$scratchDir));
$this->assertTrue($sftp->put('text.txt', 'zzzzz'));
$this->assertTrue($sftp->mkdir('subdir'));
$this->assertTrue($sftp->chdir('subdir'));
$this->assertTrue($sftp->put('leaf.txt', 'yyyyy'));
$this->assertTrue($sftp->chdir('../../'));
$list_cache_enabled = $sftp->rawlist('.', true);
$sftp->clearStatCache();
$sftp->disableStatCache();
$list_cache_disabled = $sftp->rawlist('.', true);
$this->assertEquals($list_cache_enabled, $list_cache_disabled, 'The files should be the same regardless of stat cache', 0.0, 10, true);
}
}