[Pkg-owncloud-commits] [owncloud] 35/239: Quota storage wrapper is now used for all users in sharing mode

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 356eef07398f8829a2558eee809599be60441b59
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Wed Nov 6 11:57:04 2013 +0100

    Quota storage wrapper is now used for all users in sharing mode
    
    When accessing a shared folder, the folder's owner appears as mountpoint
    but wasn't wrapped by a quota storage wrapper.
    
    This fix makes sure that all home storages are wrapped by a quota
    storage wrapper, if applicable, to make sure quotas are respected when
    uploading into shared folders.
---
 apps/files/tests/ajax_rename.php | 15 ++++++++++++
 lib/private/util.php             | 33 +++++++++++++++++++--------
 tests/lib/util.php               | 49 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 88 insertions(+), 9 deletions(-)

diff --git a/apps/files/tests/ajax_rename.php b/apps/files/tests/ajax_rename.php
index e654255..3735b0a 100644
--- a/apps/files/tests/ajax_rename.php
+++ b/apps/files/tests/ajax_rename.php
@@ -22,9 +22,18 @@
  */
 
 class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase {
+	private static $user;
 
 	function setUp() {
 		// mock OC_L10n
+		if (!self::$user) {
+			self::$user = uniqid();
+		}
+		\OC_User::createUser(self::$user, 'password');
+		\OC_User::setUserId(self::$user);
+
+		\OC\Files\Filesystem::init(self::$user, '/' . self::$user . '/files');
+
 		$l10nMock = $this->getMock('\OC_L10N', array('t'), array(), '', false);
 		$l10nMock->expects($this->any())
 			->method('t')
@@ -39,6 +48,12 @@ class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase {
 		$this->files = new \OCA\Files\App($viewMock, $l10nMock);
 	}
 
+	function tearDown() {
+		$result = \OC_User::deleteUser(self::$user);
+		$this->assertTrue($result);
+		\OC\Files\Filesystem::tearDown();
+	}
+
 	/**
 	 * @brief test rename of file/folder named "Shared"
 	 */
diff --git a/lib/private/util.php b/lib/private/util.php
index 176eb4b..88f1f19 100755
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -53,16 +53,31 @@ class OC_Util {
 
 		//if we aren't logged in, there is no use to set up the filesystem
 		if( $user != "" ) {
-			$quota = self::getUserQuota($user);
-			if ($quota !== \OC\Files\SPACE_UNLIMITED) {
-				\OC\Files\Filesystem::addStorageWrapper(function($mountPoint, $storage) use ($quota, $user) {
-					if ($mountPoint === '/' . $user . '/'){
-						return new \OC\Files\Storage\Wrapper\Quota(array('storage' => $storage, 'quota' => $quota));
-					} else {
-						return $storage;
+			\OC\Files\Filesystem::addStorageWrapper(function($mountPoint, $storage){
+				// set up quota for home storages, even for other users
+				// which can happen when using sharing
+
+				if (strlen($mountPoint) > 1) {
+					// the user name will be extracted from the mountpoint
+					// with the format '/username/' (no suffix)
+					$user = null;
+					// find second separator
+					$nextSepPos = strpos($mountPoint, '/', 1);
+					// next separator is the last one, format matches
+					if ($nextSepPos === strlen($mountPoint) - 1) {
+						$user = substr($mountPoint, 1, $nextSepPos - 1);
 					}
-				});
-			}
+					if ($user) {
+						$quota = OC_Util::getUserQuota($user);
+						if ($quota !== \OC\Files\SPACE_UNLIMITED) {
+							return new \OC\Files\Storage\Wrapper\Quota(array('storage' => $storage, 'quota' => $quota));
+						}
+					}
+				}
+
+				return $storage;
+			});
+
 			$userDir = '/'.$user.'/files';
 			$userRoot = OC_User::getHome($user);
 			$userDirectory = $userRoot . '/files';
diff --git a/tests/lib/util.php b/tests/lib/util.php
index d607a3e..852caae 100644
--- a/tests/lib/util.php
+++ b/tests/lib/util.php
@@ -94,6 +94,55 @@ class Test_Util extends PHPUnit_Framework_TestCase {
 	}
 
 	/**
+	 * Tests that the home storage is not wrapped when no quota exists.
+	 */
+	function testHomeStorageWrapperWithoutQuota() {
+		$user1 = uniqid();
+		\OC_User::createUser($user1, 'test');
+		OC_Preferences::setValue($user1, 'files', 'quota', 'none');
+		\OC_User::setUserId($user1);
+
+		\OC_Util::setupFS($user1);
+
+		$userMount = \OC\Files\Filesystem::getMountManager()->find('/' . $user1 . '/');
+		$this->assertNotNull($userMount);
+		$this->assertNotInstanceOf('\OC\Files\Storage\Wrapper\Quota', $userMount->getStorage());
+
+		// clean up
+		\OC_User::setUserId('');
+		\OC_User::deleteUser($user1);
+		OC_Preferences::deleteUser($user1);
+		\OC_Util::tearDownFS();
+	}
+
+	/**
+	 * Tests that the home storage is not wrapped when no quota exists.
+	 */
+	function testHomeStorageWrapperWithQuota() {
+		$user1 = uniqid();
+		\OC_User::createUser($user1, 'test');
+		OC_Preferences::setValue($user1, 'files', 'quota', '1024');
+		\OC_User::setUserId($user1);
+
+		\OC_Util::setupFS($user1);
+
+		$userMount = \OC\Files\Filesystem::getMountManager()->find('/' . $user1 . '/');
+		$this->assertNotNull($userMount);
+		$this->assertInstanceOf('\OC\Files\Storage\Wrapper\Quota', $userMount->getStorage());
+
+		// ensure that root wasn't wrapped
+		$rootMount = \OC\Files\Filesystem::getMountManager()->find('/');
+		$this->assertNotNull($rootMount);
+		$this->assertNotInstanceOf('\OC\Files\Storage\Wrapper\Quota', $rootMount->getStorage());
+
+		// clean up
+		\OC_User::setUserId('');
+		\OC_User::deleteUser($user1);
+		OC_Preferences::deleteUser($user1);
+		\OC_Util::tearDownFS();
+	}
+
+	/**
 	 * @dataProvider baseNameProvider
 	 */
 	public function testBaseName($expected, $file)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git