sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

clear permissions cache when scanning a file

remotes/origin/stable6
Robin Appelman 2013-09-19 21:37:52 +07:00 committed by Andreas Fischer
parent bc1c6039b7
commit 235517f111
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/files/cache/scanner.php vendored
Unescape Escape View File

@ -36,6 +36,11 @@ class Scanner extends BasicEmitter {
*/
private $cache;
/**
* @var \OC\Files\Cache\Permissions $permissionsCache
*/
private $permissionsCache;
const SCAN_RECURSIVE = true;
const SCAN_SHALLOW = false;
@ -46,6 +51,7 @@ class Scanner extends BasicEmitter {
$this->storage = $storage;
$this->storageId = $this->storage->getId();
$this->cache = $storage->getCache();
$this->permissionsCache = $storage->getPermissionsCache();
}
/**
@ -96,7 +102,11 @@ class Scanner extends BasicEmitter {
}
}
$newData = $data;
if ($reuseExisting and $cacheData = $this->cache->get($file)) {
$cacheData = $this->cache->get($file);
if ($cacheData) {
$this->permissionsCache->remove($cacheData['fileid']);
}
if ($reuseExisting and $cacheData) {
// prevent empty etag
$etag = $cacheData['etag'];
$propagateETagChange = false;
@ -104,7 +114,6 @@ class Scanner extends BasicEmitter {
$etag = $data['etag'];
$propagateETagChange = true;
}
// only reuse data if the file hasn't explicitly changed
if (isset($data['mtime']) && isset($cacheData['mtime']) && $data['mtime'] === $cacheData['mtime']) {
if (($reuseExisting & self::REUSE_SIZE) && ($data['size'] === -1)) {
@ -182,7 +191,7 @@ class Scanner extends BasicEmitter {
$newChildren = array();
if ($this->storage->is_dir($path) && ($dh = $this->storage->opendir($path))) {
\OC_DB::beginTransaction();
if(is_resource($dh)) {
if (is_resource($dh)) {
while (($file = readdir($dh)) !== false) {
$child = ($path) ? $path . '/' . $file : $file;
if (!Filesystem::isIgnoredDir($file)) {

17
tests/lib/files/cache/permissions.php vendored
Unescape Escape View File

@ -8,6 +8,8 @@
namespace Test\Files\Cache;
use OC\Files\Storage\Temporary;
class Permissions extends \PHPUnit_Framework_TestCase {
/***
* @var \OC\Files\Cache\Permissions $permissionsCache
@ -55,4 +57,19 @@ class Permissions extends \PHPUnit_Framework_TestCase {
$this->permissionsCache->removeMultiple($ids, $user);
}
public function testUpdatePermissionsOnRescan() {
$storage = new Temporary(array());
$scanner = $storage->getScanner();
$cache = $storage->getCache();
$permissionsCache = $storage->getPermissionsCache();
$storage->file_put_contents('foo.txt', 'bar');
$scanner->scan('');
$id = $cache->getId('foo.txt');
$permissionsCache->set($id, 'test', 1);
$scanner->scan('');
$this->assertEquals(-1, $permissionsCache->get($id, 'test'));
}
}