mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix cache update when doing a rename that overwrites the target

This commit is contained in:
Robin Appelman 2015-02-27 14:26:52 +01:00
parent 8abb80c642
commit fc027bceb7
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/private/files/cache/updater.php vendored
View File

@ -45,7 +45,7 @@ class Updater {
* @param int $time
*/
public function update($path, $time = null) {
if(Scanner::isPartialFile($path)) {
if (Scanner::isPartialFile($path)) {
return;
}
/**
@ -116,6 +116,9 @@ class Updater {
if ($sourceStorage && $targetStorage) {
if ($sourceStorage === $targetStorage) {
$cache = $sourceStorage->getCache($sourceInternalPath);
if ($cache->inCache($targetInternalPath)) {
$cache->remove($targetInternalPath);
}
$cache->move($sourceInternalPath, $targetInternalPath);
if (pathinfo($sourceInternalPath, PATHINFO_EXTENSION) !== pathinfo($targetInternalPath, PATHINFO_EXTENSION)) {

13
tests/lib/files/view.php
View File

@ -962,4 +962,17 @@ class View extends \Test\TestCase {
public function testConstructDirectoryTraversalException($root) {
new \OC\Files\View($root);
}
public function testRenameOverWrite() {
$storage = new Temporary(array());
$scanner = $storage->getScanner();
$storage->mkdir('sub');
$storage->mkdir('foo');
$storage->file_put_contents('foo.txt', 'asd');
$storage->file_put_contents('foo/bar.txt', 'asd');
$scanner->scan('');
\OC\Files\Filesystem::mount($storage, array(), '/test/');
$view = new \OC\Files\View('');
$this->assertTrue($view->rename('/test/foo.txt', '/test/foo/bar.txt'));
}
}