From 4322287fc3561b6c34f289c41519e1fa0f034565 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Thu, 5 Mar 2015 22:23:47 +0100 Subject: [PATCH 1/2] Fix size propagation over shared storage boundary --- apps/files_sharing/lib/cache.php | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php index e073783481..b71dfb44ab 100644 --- a/apps/files_sharing/lib/cache.php +++ b/apps/files_sharing/lib/cache.php @@ -394,6 +394,28 @@ class Shared_Cache extends Cache { return $result; } + /** + * update the folder size and the size of all parent folders + * + * @param string|boolean $path + * @param array $data (optional) meta data of the folder + */ + public function correctFolderSize($path, $data = null) { + $this->calculateFolderSize($path, $data); + if ($path !== '') { + $parent = dirname($path); + if ($parent === '.' or $parent === '/') { + $parent = ''; + } + $this->correctFolderSize($parent); + } else { + // bubble up to source cache + $sourceCache = $this->getSourceCache($path); + $parent = dirname($this->files[$path]); + $sourceCache->correctFolderSize($parent); + } + } + /** * get the size of a folder and set it in the cache * From ec19d9c267e09028456706d0957be84b77150861 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Mon, 9 Mar 2015 12:41:29 +0100 Subject: [PATCH 2/2] Add unit test for size propagation across share boundaries --- apps/files_sharing/tests/propagation.php | 90 ++++++++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 apps/files_sharing/tests/propagation.php diff --git a/apps/files_sharing/tests/propagation.php b/apps/files_sharing/tests/propagation.php new file mode 100644 index 0000000000..3d5f9985af --- /dev/null +++ b/apps/files_sharing/tests/propagation.php @@ -0,0 +1,90 @@ + + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE + * License as published by the Free Software Foundation; either + * version 3 of the License, or any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * + * You should have received a copy of the GNU Affero General Public + * License along with this library. If not, see . + * + */ + +namespace OCA\Files_sharing\Tests; + +use OC\Files\View; + +class Propagation extends TestCase { + + public function testSizePropagationWhenOwnerChangesFile() { + $this->loginAsUser(self::TEST_FILES_SHARING_API_USER1); + $recipientView = new View('/' . self::TEST_FILES_SHARING_API_USER1 . '/files'); + + $this->loginAsUser(self::TEST_FILES_SHARING_API_USER2); + $ownerView = new View('/' . self::TEST_FILES_SHARING_API_USER2 . '/files'); + $ownerView->mkdir('/sharedfolder/subfolder'); + $ownerView->file_put_contents('/sharedfolder/subfolder/foo.txt', 'bar'); + + $sharedFolderInfo = $ownerView->getFileInfo('/sharedfolder', false); + \OCP\Share::shareItem('folder', $sharedFolderInfo->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER1, 31); + $ownerRootInfo = $ownerView->getFileInfo('', false); + + $this->loginAsUser(self::TEST_FILES_SHARING_API_USER1); + $this->assertTrue($recipientView->file_exists('/sharedfolder/subfolder/foo.txt')); + $recipientRootInfo = $recipientView->getFileInfo('', false); + + // when file changed as owner + $this->loginAsUser(self::TEST_FILES_SHARING_API_USER2); + $ownerView->file_put_contents('/sharedfolder/subfolder/foo.txt', 'foobar'); + + // size of recipient's root stays the same + $this->loginAsUser(self::TEST_FILES_SHARING_API_USER1); + $newRecipientRootInfo = $recipientView->getFileInfo('', false); + $this->assertEquals($recipientRootInfo->getSize(), $newRecipientRootInfo->getSize()); + + // size of owner's root increases + $this->loginAsUser(self::TEST_FILES_SHARING_API_USER2); + $newOwnerRootInfo = $ownerView->getFileInfo('', false); + $this->assertEquals($ownerRootInfo->getSize() + 3, $newOwnerRootInfo->getSize()); + } + + public function testSizePropagationWhenRecipientChangesFile() { + $this->loginAsUser(self::TEST_FILES_SHARING_API_USER1); + $recipientView = new View('/' . self::TEST_FILES_SHARING_API_USER1 . '/files'); + + $this->loginAsUser(self::TEST_FILES_SHARING_API_USER2); + $ownerView = new View('/' . self::TEST_FILES_SHARING_API_USER2 . '/files'); + $ownerView->mkdir('/sharedfolder/subfolder'); + $ownerView->file_put_contents('/sharedfolder/subfolder/foo.txt', 'bar'); + + $sharedFolderInfo = $ownerView->getFileInfo('/sharedfolder', false); + \OCP\Share::shareItem('folder', $sharedFolderInfo->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER1, 31); + $ownerRootInfo = $ownerView->getFileInfo('', false); + + $this->loginAsUser(self::TEST_FILES_SHARING_API_USER1); + $this->assertTrue($recipientView->file_exists('/sharedfolder/subfolder/foo.txt')); + $recipientRootInfo = $recipientView->getFileInfo('', false); + + // when file changed as recipient + $recipientView->file_put_contents('/sharedfolder/subfolder/foo.txt', 'foobar'); + + // size of recipient's root stays the same + $newRecipientRootInfo = $recipientView->getFileInfo('', false); + $this->assertEquals($recipientRootInfo->getSize(), $newRecipientRootInfo->getSize()); + + // size of owner's root increases + $this->loginAsUser(self::TEST_FILES_SHARING_API_USER2); + $newOwnerRootInfo = $ownerView->getFileInfo('', false); + $this->assertEquals($ownerRootInfo->getSize() + 3, $newOwnerRootInfo->getSize()); + } +}