[Pkg-owncloud-commits] [owncloud] 09/62: Keep versions when deleting as recipient
David Prévot
taffit at moszumanska.debian.org
Tue Jun 23 23:39:33 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to annotated tag v8.0.5beta
in repository owncloud.
commit bffcbe4895e97e1dbeabcd04b88b209403219d9b
Author: Vincent Petry <pvince81 at owncloud.com>
Date: Tue Jun 2 16:44:25 2015 +0200
Keep versions when deleting as recipient
The original owner could not be resolved because the original file was
already deleted, so no versions were retained.
This fix passes the owner and path to retainVersions() since it was
already resolved before the file deletion. This reactivates the versions
logic and creates a copy of the versions in each trashbin.
---
apps/files_trashbin/lib/trashbin.php | 18 +++---
apps/files_trashbin/tests/storage.php | 116 ++++++++++++++++++++++++++++++++++
2 files changed, 125 insertions(+), 9 deletions(-)
diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index f30d615..e17f261 100644
--- a/apps/files_trashbin/lib/trashbin.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -158,6 +158,10 @@ class Trashbin {
}
self::setUpTrash($user);
+ if ($owner !== $user) {
+ // also setup for owner
+ self::setUpTrash($owner);
+ }
$path_parts = pathinfo($file_path);
@@ -201,7 +205,7 @@ class Trashbin {
\OCP\Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_moveToTrash', array('filePath' => \OC\Files\Filesystem::normalizePath($file_path),
'trashPath' => \OC\Files\Filesystem::normalizePath($filename . '.d' . $timestamp)));
- $size += self::retainVersions($file_path, $filename, $timestamp);
+ $size += self::retainVersions($file_path, $filename, $owner, $ownerPath, $timestamp);
$size += self::retainEncryptionKeys($file_path, $filename, $timestamp);
// if owner !== user we need to also add a copy to the owners trash
@@ -228,13 +232,15 @@ class Trashbin {
*
* @param string $file_path path to original file
* @param string $filename of deleted file
+ * @param string $owner owner user id
+ * @param string $ownerPath path relative to the owner's home storage
* @param integer $timestamp when the file was deleted
*
* @return int size of stored versions
*/
- private static function retainVersions($file_path, $filename, $timestamp) {
+ private static function retainVersions($file_path, $filename, $owner, $ownerPath, $timestamp) {
$size = 0;
- if (\OCP\App::isEnabled('files_versions')) {
+ if (\OCP\App::isEnabled('files_versions') && !empty($ownerPath)) {
// disable proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
@@ -243,12 +249,6 @@ class Trashbin {
$user = \OCP\User::getUser();
$rootView = new \OC\Files\View('/');
- list($owner, $ownerPath) = self::getUidAndFilename($file_path);
- // file has been deleted in between
- if (empty($ownerPath)) {
- return 0;
- }
-
if ($rootView->is_dir($owner . '/files_versions/' . $ownerPath)) {
$size += self::calculateSize(new \OC\Files\View('/' . $owner . '/files_versions/' . $ownerPath));
if ($owner !== $user) {
diff --git a/apps/files_trashbin/tests/storage.php b/apps/files_trashbin/tests/storage.php
index 7210386..44ccd3c 100644
--- a/apps/files_trashbin/tests/storage.php
+++ b/apps/files_trashbin/tests/storage.php
@@ -187,6 +187,10 @@ class Storage extends \Test\TestCase {
$this->assertEquals(1, count($results));
$name = $results[0]->getName();
$this->assertEquals('test.txt.v', substr($name, 0, strlen('test.txt.v')));
+
+ // versions deleted
+ $results = $this->rootView->getDirectoryContent($this->user . '/files_versions/');
+ $this->assertEquals(0, count($results));
}
/**
@@ -218,6 +222,118 @@ class Storage extends \Test\TestCase {
$this->assertEquals(1, count($results));
$name = $results[0]->getName();
$this->assertEquals('inside.txt.v', substr($name, 0, strlen('inside.txt.v')));
+
+ // versions deleted
+ $results = $this->rootView->getDirectoryContent($this->user . '/files_versions/folder/');
+ $this->assertEquals(0, count($results));
+ }
+
+ /**
+ * Test that deleted versions properly land in the trashbin when deleting as share recipient.
+ */
+ public function testDeleteVersionsOfFileAsRecipient() {
+ \OCA\Files_Versions\Hooks::connectHooks();
+
+ $this->userView->mkdir('share');
+ // trigger a version (multiple would not work because of the expire logic)
+ $this->userView->file_put_contents('share/test.txt', 'v1');
+ $this->userView->file_put_contents('share/test.txt', 'v2');
+
+ $results = $this->rootView->getDirectoryContent($this->user . '/files_versions/share/');
+ $this->assertEquals(1, count($results));
+
+ $recipientUser = $this->getUniqueId('recipient_');
+ \OC::$server->getUserManager()->createUser($recipientUser, $recipientUser);
+
+ $fileinfo = $this->userView->getFileInfo('share');
+ $this->assertTrue(\OCP\Share::shareItem('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
+ $recipientUser, 31));
+
+ $this->loginAsUser($recipientUser);
+
+ // delete as recipient
+ $recipientView = new \OC\Files\View('/' . $recipientUser . '/files');
+ $recipientView->unlink('share/test.txt');
+
+ // rescan trash storage for both users
+ list($rootStorage,) = $this->rootView->resolvePath($this->user . '/files_trashbin');
+ $rootStorage->getScanner()->scan('');
+
+ // check if versions are in trashbin for both users
+ $results = $this->rootView->getDirectoryContent($this->user . '/files_trashbin/versions');
+ $this->assertEquals(1, count($results), 'Versions in owner\'s trashbin');
+ $name = $results[0]->getName();
+ $this->assertEquals('test.txt.v', substr($name, 0, strlen('test.txt.v')));
+
+ $results = $this->rootView->getDirectoryContent($recipientUser . '/files_trashbin/versions');
+ $this->assertEquals(1, count($results), 'Versions in recipient\'s trashbin');
+ $name = $results[0]->getName();
+ $this->assertEquals('test.txt.v', substr($name, 0, strlen('test.txt.v')));
+
+ // versions deleted
+ $results = $this->rootView->getDirectoryContent($this->user . '/files_versions/share/');
+ $this->assertEquals(0, count($results));
+ }
+
+ /**
+ * Test that deleted versions properly land in the trashbin when deleting as share recipient.
+ */
+ public function testDeleteVersionsOfFolderAsRecipient() {
+ \OCA\Files_Versions\Hooks::connectHooks();
+
+ $this->userView->mkdir('share');
+ $this->userView->mkdir('share/folder');
+ // trigger a version (multiple would not work because of the expire logic)
+ $this->userView->file_put_contents('share/folder/test.txt', 'v1');
+ $this->userView->file_put_contents('share/folder/test.txt', 'v2');
+
+ $results = $this->rootView->getDirectoryContent($this->user . '/files_versions/share/folder/');
+ $this->assertEquals(1, count($results));
+
+ $recipientUser = $this->getUniqueId('recipient_');
+ \OC::$server->getUserManager()->createUser($recipientUser, $recipientUser);
+
+ $fileinfo = $this->userView->getFileInfo('share');
+ $this->assertTrue(\OCP\Share::shareItem('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
+ $recipientUser, 31));
+
+ $this->loginAsUser($recipientUser);
+
+ // delete as recipient
+ $recipientView = new \OC\Files\View('/' . $recipientUser . '/files');
+ $recipientView->rmdir('share/folder');
+
+ // rescan trash storage
+ list($rootStorage,) = $this->rootView->resolvePath($this->user . '/files_trashbin');
+ $rootStorage->getScanner()->scan('');
+
+ // check if versions are in trashbin for owner
+ $results = $this->rootView->getDirectoryContent($this->user . '/files_trashbin/versions');
+ $this->assertEquals(1, count($results));
+ $name = $results[0]->getName();
+ $this->assertEquals('folder.d', substr($name, 0, strlen('folder.d')));
+
+ // check if file versions are in trashbin for owner
+ $results = $this->rootView->getDirectoryContent($this->user . '/files_trashbin/versions/' . $name . '/');
+ $this->assertEquals(1, count($results));
+ $name = $results[0]->getName();
+ $this->assertEquals('test.txt.v', substr($name, 0, strlen('test.txt.v')));
+
+ // check if versions are in trashbin for recipient
+ $results = $this->rootView->getDirectoryContent($recipientUser . '/files_trashbin/versions');
+ $this->assertEquals(1, count($results));
+ $name = $results[0]->getName();
+ $this->assertEquals('folder.d', substr($name, 0, strlen('folder.d')));
+
+ // check if file versions are in trashbin for recipient
+ $results = $this->rootView->getDirectoryContent($recipientUser . '/files_trashbin/versions/' . $name . '/');
+ $this->assertEquals(1, count($results));
+ $name = $results[0]->getName();
+ $this->assertEquals('test.txt.v', substr($name, 0, strlen('test.txt.v')));
+
+ // versions deleted
+ $results = $this->rootView->getDirectoryContent($recipientUser . '/files_versions/share/folder/');
+ $this->assertEquals(0, count($results));
}
/**
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list