From 94560c68ba8974e72098e525ff1d96f11a3ae2e0 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 2 Jul 2013 16:34:58 +0200 Subject: [PATCH 01/13] rename constants --- lib/files/filesystem.php | 5 +++-- lib/files/storage/common.php | 2 +- lib/files/storage/local.php | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php index d6ebe7d629..4281ebba99 100644 --- a/lib/files/filesystem.php +++ b/lib/files/filesystem.php @@ -31,8 +31,9 @@ namespace OC\Files; use OC\Files\Storage\Loader; -const FREE_SPACE_UNKNOWN = -2; -const FREE_SPACE_UNLIMITED = -3; +const SPACE_NOT_COMPUTED = -1; +const SPACE_UNKNOWN = -2; +const SPACE_UNLIMITED = -3; class Filesystem { /** diff --git a/lib/files/storage/common.php b/lib/files/storage/common.php index 3da13ac4df..8cd978f5b4 100644 --- a/lib/files/storage/common.php +++ b/lib/files/storage/common.php @@ -366,6 +366,6 @@ abstract class Common implements \OC\Files\Storage\Storage { * @return int */ public function free_space($path) { - return \OC\Files\FREE_SPACE_UNKNOWN; + return \OC\Files\SPACE_UNKNOWN; } } diff --git a/lib/files/storage/local.php b/lib/files/storage/local.php index b08fd73ce1..5209fabc30 100644 --- a/lib/files/storage/local.php +++ b/lib/files/storage/local.php @@ -265,7 +265,7 @@ if (\OC_Util::runningOnWindows()) { public function free_space($path) { $space = @disk_free_space($this->datadir . $path); if ($space === false) { - return \OC\Files\FREE_SPACE_UNKNOWN; + return \OC\Files\SPACE_UNKNOWN; } return $space; } From 10d3e63ce5f3923dc629ac3c16f3cd6324bf96ed Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 2 Jul 2013 17:45:34 +0200 Subject: [PATCH 02/13] add quota streamwrapper that limits the amount of data that can be written to a stream --- lib/base.php | 35 +++++---- lib/files/stream/quota.php | 128 +++++++++++++++++++++++++++++++ tests/lib/files/stream/quota.php | 78 +++++++++++++++++++ 3 files changed, 225 insertions(+), 16 deletions(-) create mode 100644 lib/files/stream/quota.php create mode 100644 tests/lib/files/stream/quota.php diff --git a/lib/base.php b/lib/base.php index eaee842465..2613e88d05 100644 --- a/lib/base.php +++ b/lib/base.php @@ -91,7 +91,7 @@ class OC { // ensure we can find OC_Config set_include_path( OC::$SERVERROOT . '/lib' . PATH_SEPARATOR . - get_include_path() + get_include_path() ); OC::$SUBURI = str_replace("\\", "/", substr(realpath($_SERVER["SCRIPT_FILENAME"]), strlen(OC::$SERVERROOT))); @@ -160,11 +160,11 @@ class OC { // set the right include path set_include_path( OC::$SERVERROOT . '/lib' . PATH_SEPARATOR . - OC::$SERVERROOT . '/config' . PATH_SEPARATOR . - OC::$THIRDPARTYROOT . '/3rdparty' . PATH_SEPARATOR . - implode($paths, PATH_SEPARATOR) . PATH_SEPARATOR . - get_include_path() . PATH_SEPARATOR . - OC::$SERVERROOT + OC::$SERVERROOT . '/config' . PATH_SEPARATOR . + OC::$THIRDPARTYROOT . '/3rdparty' . PATH_SEPARATOR . + implode($paths, PATH_SEPARATOR) . PATH_SEPARATOR . + get_include_path() . PATH_SEPARATOR . + OC::$SERVERROOT ); } @@ -278,17 +278,17 @@ class OC { ini_set('session.cookie_httponly', '1;'); // set the cookie path to the ownCloud directory - $cookie_path = OC::$WEBROOT ?: '/'; + $cookie_path = OC::$WEBROOT ? : '/'; ini_set('session.cookie_path', $cookie_path); //set the session object to a dummy session so code relying on the session existing still works self::$session = new \OC\Session\Memory(''); - - try{ + + try { // set the session name to the instance id - which is unique self::$session = new \OC\Session\Internal(OC_Util::getInstanceId()); // if session cant be started break with http 500 error - }catch (Exception $e){ + } catch (Exception $e) { OC_Log::write('core', 'Session could not be initialized', OC_Log::ERROR); @@ -352,7 +352,7 @@ class OC { public static function init() { // register autoloader require_once __DIR__ . '/autoloader.php'; - self::$loader=new \OC\Autoloader(); + self::$loader = new \OC\Autoloader(); self::$loader->registerPrefix('Doctrine\\Common', 'doctrine/common/lib'); self::$loader->registerPrefix('Doctrine\\DBAL', 'doctrine/dbal/lib'); self::$loader->registerPrefix('Symfony\\Component\\Routing', 'symfony/routing'); @@ -373,7 +373,7 @@ class OC { ini_set('arg_separator.output', '&'); // try to switch magic quotes off. - if (get_magic_quotes_gpc()==1) { + if (get_magic_quotes_gpc() == 1) { ini_set('magic_quotes_runtime', 0); } @@ -398,7 +398,8 @@ class OC { //set http auth headers for apache+php-cgi work around if (isset($_SERVER['HTTP_AUTHORIZATION']) - && preg_match('/Basic\s+(.*)$/i', $_SERVER['HTTP_AUTHORIZATION'], $matches)) { + && preg_match('/Basic\s+(.*)$/i', $_SERVER['HTTP_AUTHORIZATION'], $matches) + ) { list($name, $password) = explode(':', base64_decode($matches[1]), 2); $_SERVER['PHP_AUTH_USER'] = strip_tags($name); $_SERVER['PHP_AUTH_PW'] = strip_tags($password); @@ -406,7 +407,8 @@ class OC { //set http auth headers for apache+php-cgi work around if variable gets renamed by apache if (isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION']) - && preg_match('/Basic\s+(.*)$/i', $_SERVER['REDIRECT_HTTP_AUTHORIZATION'], $matches)) { + && preg_match('/Basic\s+(.*)$/i', $_SERVER['REDIRECT_HTTP_AUTHORIZATION'], $matches) + ) { list($name, $password) = explode(':', base64_decode($matches[1]), 2); $_SERVER['PHP_AUTH_USER'] = strip_tags($name); $_SERVER['PHP_AUTH_PW'] = strip_tags($password); @@ -435,10 +437,11 @@ class OC { stream_wrapper_register('fakedir', 'OC\Files\Stream\Dir'); stream_wrapper_register('static', 'OC\Files\Stream\StaticStream'); stream_wrapper_register('close', 'OC\Files\Stream\Close'); + stream_wrapper_register('quota', 'OC\Files\Stream\Quota'); stream_wrapper_register('oc', 'OC\Files\Stream\OC'); self::initTemplateEngine(); - if ( !self::$CLI ) { + if (!self::$CLI) { self::initSession(); } else { self::$session = new \OC\Session\Memory(''); @@ -459,7 +462,7 @@ class OC { // User and Groups if (!OC_Config::getValue("installed", false)) { - self::$session->set('user_id',''); + self::$session->set('user_id', ''); } OC_User::useBackend(new OC_User_Database()); diff --git a/lib/files/stream/quota.php b/lib/files/stream/quota.php new file mode 100644 index 0000000000..53d8a03d30 --- /dev/null +++ b/lib/files/stream/quota.php @@ -0,0 +1,128 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\Files\Stream; + +/** + * stream wrapper limits the amount of data that can be written to a stream + * + * usage: void \OC\Files\Stream\Quota::register($id, $stream, $limit) + * or: resource \OC\Files\Stream\Quota::wrap($stream, $limit) + */ +class Quota { + private static $streams = array(); + + /** + * @var resource $source + */ + private $source; + + /** + * @var int $limit + */ + private $limit; + + /** + * @param string $id + * @param resource $stream + * @param int $limit + */ + public static function register($id, $stream, $limit) { + self::$streams[$id] = array($stream, $limit); + } + + /** + * remove all registered streams + */ + public static function clear() { + self::$streams = array(); + } + + /** + * @param resource $stream + * @param int $limit + * @return resource + */ + static public function wrap($stream, $limit) { + $id = uniqid(); + self::register($id, $stream, $limit); + $meta = stream_get_meta_data($stream); + return fopen('quota://' . $id, $meta['mode']); + } + + public function stream_open($path, $mode, $options, &$opened_path) { + $id = substr($path, strlen('quota://')); + if (isset(self::$streams[$id])) { + list($this->source, $this->limit) = self::$streams[$id]; + return true; + } else { + return false; + } + } + + public function stream_seek($offset, $whence = SEEK_SET) { + if ($whence === SEEK_SET) { + $this->limit += $this->stream_tell() - $offset; + } else { + $this->limit -= $offset; + } + fseek($this->source, $offset, $whence); + } + + public function stream_tell() { + return ftell($this->source); + } + + public function stream_read($count) { + $this->limit -= $count; + return fread($this->source, $count); + } + + public function stream_write($data) { + $size = strlen($data); + if ($size > $this->limit) { + $data = substr($data, 0, $this->limit); + $size = $this->limit; + } + $this->limit -= $size; + return fwrite($this->source, $data); + } + + public function stream_set_option($option, $arg1, $arg2) { + switch ($option) { + case STREAM_OPTION_BLOCKING: + stream_set_blocking($this->source, $arg1); + break; + case STREAM_OPTION_READ_TIMEOUT: + stream_set_timeout($this->source, $arg1, $arg2); + break; + case STREAM_OPTION_WRITE_BUFFER: + stream_set_write_buffer($this->source, $arg1, $arg2); + } + } + + public function stream_stat() { + return fstat($this->source); + } + + public function stream_lock($mode) { + flock($this->source, $mode); + } + + public function stream_flush() { + return fflush($this->source); + } + + public function stream_eof() { + return feof($this->source); + } + + public function stream_close() { + fclose($this->source); + } +} diff --git a/tests/lib/files/stream/quota.php b/tests/lib/files/stream/quota.php new file mode 100644 index 0000000000..22d3e93592 --- /dev/null +++ b/tests/lib/files/stream/quota.php @@ -0,0 +1,78 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace Test\Files\Stream; + +class Quota extends \PHPUnit_Framework_TestCase { + public function tearDown() { + \OC\Files\Stream\Quota::clear(); + } + + protected function getStream($mode, $limit) { + $source = fopen('php://temp', $mode); + return \OC\Files\Stream\Quota::wrap($source, $limit); + } + + public function testWriteEnoughSpace() { + $stream = $this->getStream('w+', 100); + $this->assertEquals(6, fwrite($stream, 'foobar')); + rewind($stream); + $this->assertEquals('foobar', fread($stream, 100)); + } + + public function testWriteNotEnoughSpace() { + $stream = $this->getStream('w+', 3); + $this->assertEquals(3, fwrite($stream, 'foobar')); + rewind($stream); + $this->assertEquals('foo', fread($stream, 100)); + } + + public function testWriteNotEnoughSpaceSecondTime() { + $stream = $this->getStream('w+', 9); + $this->assertEquals(6, fwrite($stream, 'foobar')); + $this->assertEquals(3, fwrite($stream, 'qwerty')); + rewind($stream); + $this->assertEquals('foobarqwe', fread($stream, 100)); + } + + public function testWriteEnoughSpaceRewind() { + $stream = $this->getStream('w+', 6); + $this->assertEquals(6, fwrite($stream, 'foobar')); + rewind($stream); + $this->assertEquals(3, fwrite($stream, 'qwe')); + rewind($stream); + $this->assertEquals('qwebar', fread($stream, 100)); + } + + public function testWriteNotEnoughSpaceRead() { + $stream = $this->getStream('w+', 6); + $this->assertEquals(6, fwrite($stream, 'foobar')); + rewind($stream); + $this->assertEquals('foobar', fread($stream, 6)); + $this->assertEquals(0, fwrite($stream, 'qwe')); + } + + public function testWriteNotEnoughSpaceExistingStream() { + $source = fopen('php://temp', 'w+'); + fwrite($source, 'foobar'); + $stream = \OC\Files\Stream\Quota::wrap($source, 3); + $this->assertEquals(3, fwrite($stream, 'foobar')); + rewind($stream); + $this->assertEquals('foobarfoo', fread($stream, 100)); + } + + public function testWriteNotEnoughSpaceExistingStreamRewind() { + $source = fopen('php://temp', 'w+'); + fwrite($source, 'foobar'); + $stream = \OC\Files\Stream\Quota::wrap($source, 3); + rewind($stream); + $this->assertEquals(6, fwrite($stream, 'qwerty')); + rewind($stream); + $this->assertEquals('qwerty', fread($stream, 100)); + } +} From a853968f7dddcbb18e815f0323ed3046e048e4b1 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 2 Jul 2013 17:58:21 +0200 Subject: [PATCH 03/13] move storage wrapper test to new namespace --- tests/lib/files/storage/{ => wrapper}/wrapper.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename tests/lib/files/storage/{ => wrapper}/wrapper.php (86%) diff --git a/tests/lib/files/storage/wrapper.php b/tests/lib/files/storage/wrapper/wrapper.php similarity index 86% rename from tests/lib/files/storage/wrapper.php rename to tests/lib/files/storage/wrapper/wrapper.php index 2794a0a626..e31abfc732 100644 --- a/tests/lib/files/storage/wrapper.php +++ b/tests/lib/files/storage/wrapper/wrapper.php @@ -6,9 +6,9 @@ * See the COPYING-README file. */ -namespace Test\Files\Storage; +namespace Test\Files\Storage\Wrapper; -class Wrapper extends Storage { +class Wrapper extends \Test\Files\Storage\Storage { /** * @var string tmpDir */ From cd8f0c21ced2283a8cf8b48af1c91d665a1dab49 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 2 Jul 2013 18:22:49 +0200 Subject: [PATCH 04/13] add quota storage wrapper --- lib/files/storage/wrapper/quota.php | 104 ++++++++++++++++++++++ tests/lib/files/storage/wrapper/quota.php | 61 +++++++++++++ 2 files changed, 165 insertions(+) create mode 100644 lib/files/storage/wrapper/quota.php create mode 100644 tests/lib/files/storage/wrapper/quota.php diff --git a/lib/files/storage/wrapper/quota.php b/lib/files/storage/wrapper/quota.php new file mode 100644 index 0000000000..bc2d893976 --- /dev/null +++ b/lib/files/storage/wrapper/quota.php @@ -0,0 +1,104 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\Files\Storage\Wrapper; + +class Quota extends Wrapper { + + /** + * @var int $quota + */ + protected $quota; + + /** + * @param array $parameters + */ + public function __construct($parameters) { + $this->storage = $parameters['storage']; + $this->quota = $parameters['quota']; + } + + protected function getSize($path) { + $cache = $this->getCache(); + $data = $cache->get($path); + if (is_array($data) and isset($data['size'])) { + return $data['size']; + } else { + return \OC\Files\SPACE_NOT_COMPUTED; + } + } + + /** + * Get free space as limited by the quota + * + * @param string $path + * @return int + */ + public function free_space($path) { + if ($this->quota < 0) { + return $this->storage->free_space($path); + } else { + $used = $this->getSize(''); + if ($used < 0) { + return \OC\Files\SPACE_NOT_COMPUTED; + } else { + $free = $this->storage->free_space($path); + return min($free, ($this->quota - $used)); + } + } + } + + /** + * see http://php.net/manual/en/function.file_put_contents.php + * + * @param string $path + * @param string $data + * @return bool + */ + public function file_put_contents($path, $data) { + $free = $this->free_space(''); + if ($free < 0 or strlen($data) < $free) { + return $this->storage->file_put_contents($path, $data); + } else { + return false; + } + } + + /** + * see http://php.net/manual/en/function.copy.php + * + * @param string $source + * @param string $target + * @return bool + */ + public function copy($source, $target) { + $free = $this->free_space(''); + if ($free < 0 or $this->getSize($source) < $free) { + return $this->storage->copy($source, $target); + } else { + return false; + } + } + + /** + * see http://php.net/manual/en/function.fopen.php + * + * @param string $path + * @param string $mode + * @return resource + */ + public function fopen($path, $mode) { + $source = $this->storage->fopen($path, $mode); + $free = $this->free_space(''); + if ($free >= 0) { + return \OC\Files\Stream\Quota::wrap($source, $free); + } else { + return $source; + } + } +} diff --git a/tests/lib/files/storage/wrapper/quota.php b/tests/lib/files/storage/wrapper/quota.php new file mode 100644 index 0000000000..3702f8154f --- /dev/null +++ b/tests/lib/files/storage/wrapper/quota.php @@ -0,0 +1,61 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace Test\Files\Storage\Wrapper; + +//ensure the constants are loaded +\OC::$loader->load('\OC\Files\Filesystem'); + +class Quota extends \Test\Files\Storage\Storage { + /** + * @var string tmpDir + */ + private $tmpDir; + + public function setUp() { + $this->tmpDir = \OC_Helper::tmpFolder(); + $storage = new \OC\Files\Storage\Local(array('datadir' => $this->tmpDir)); + $this->instance = new \OC\Files\Storage\Wrapper\Quota(array('storage' => $storage, 'quota' => 10000000)); + } + + public function tearDown() { + \OC_Helper::rmdirr($this->tmpDir); + } + + protected function getLimitedStorage($limit) { + $storage = new \OC\Files\Storage\Local(array('datadir' => $this->tmpDir)); + $storage->getScanner()->scan(''); + return new \OC\Files\Storage\Wrapper\Quota(array('storage' => $storage, 'quota' => $limit)); + } + + public function testFilePutContentsNotEnoughSpace() { + $instance = $this->getLimitedStorage(3); + $this->assertFalse($instance->file_put_contents('foo', 'foobar')); + } + + public function testCopyNotEnoughSpace() { + $instance = $this->getLimitedStorage(9); + $this->assertEquals(6, $instance->file_put_contents('foo', 'foobar')); + $instance->getScanner()->scan(''); + $this->assertFalse($instance->copy('foo', 'bar')); + } + + public function testFreeSpace() { + $instance = $this->getLimitedStorage(9); + $this->assertEquals(9, $instance->free_space('')); + } + + public function testFWriteNotEnoughSpace() { + $instance = $this->getLimitedStorage(9); + $stream = $instance->fopen('foo', 'w+'); + $this->assertEquals(6, fwrite($stream, 'foobar')); + $this->assertEquals(3, fwrite($stream, 'qwerty')); + fclose($stream); + $this->assertEquals('foobarqwe', $instance->file_get_contents('foo')); + } +} From 4e490b0688bcfff7bd489af039b0db79427fbb94 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 25 Jul 2013 15:59:57 +0200 Subject: [PATCH 05/13] fix getPermissionsCache for storage wrapper --- lib/files/storage/wrapper/wrapper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/files/storage/wrapper/wrapper.php b/lib/files/storage/wrapper/wrapper.php index 4feb0520f1..0336c27efa 100644 --- a/lib/files/storage/wrapper/wrapper.php +++ b/lib/files/storage/wrapper/wrapper.php @@ -395,7 +395,7 @@ class Wrapper implements \OC\Files\Storage\Storage { * @return \OC\Files\Cache\Permissions */ public function getPermissionsCache($path = '') { - return $this->storage->getPermissions($path); + return $this->storage->getPermissionsCache($path); } /** From f4b6a8aa08919a55cff48195725513d58f2d1da9 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 25 Jul 2013 16:00:24 +0200 Subject: [PATCH 06/13] add option to wrap existing mounts --- lib/files/mount/manager.php | 7 +++++++ lib/files/mount/mount.php | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/lib/files/mount/manager.php b/lib/files/mount/manager.php index 25a5fe241c..4c432dcf72 100644 --- a/lib/files/mount/manager.php +++ b/lib/files/mount/manager.php @@ -95,6 +95,13 @@ class Manager { return $result; } + /** + * @return Mount[] + */ + public function getAll() { + return $this->mounts; + } + /** * Find mounts by numeric storage id * diff --git a/lib/files/mount/mount.php b/lib/files/mount/mount.php index 17b0055ee8..0ce2f5975c 100644 --- a/lib/files/mount/mount.php +++ b/lib/files/mount/mount.php @@ -138,4 +138,11 @@ class Mount { } return $path; } + + /** + * @param callable $wrapper + */ + public function wrapStorage($wrapper) { + $this->storage = $wrapper($this->mountPoint, $this->storage); + } } From d042c8f1667c7fdf63c96c640acfe3af9cadeacf Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 25 Jul 2013 16:00:48 +0200 Subject: [PATCH 07/13] use renamed constants --- lib/helper.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/helper.php b/lib/helper.php index ca508e1d93..0d55682bdb 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -815,14 +815,14 @@ class OC_Helper { $post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size')); $freeSpace = \OC\Files\Filesystem::free_space($dir); if ((int)$upload_max_filesize === 0 and (int)$post_max_size === 0) { - $maxUploadFilesize = \OC\Files\FREE_SPACE_UNLIMITED; + $maxUploadFilesize = \OC\Files\SPACE_UNLIMITED; } elseif ((int)$upload_max_filesize === 0 or (int)$post_max_size === 0) { $maxUploadFilesize = max($upload_max_filesize, $post_max_size); //only the non 0 value counts } else { $maxUploadFilesize = min($upload_max_filesize, $post_max_size); } - if($freeSpace !== \OC\Files\FREE_SPACE_UNKNOWN){ + if($freeSpace !== \OC\Files\SPACE_UNKNOWN){ $freeSpace = max($freeSpace, 0); return min($maxUploadFilesize, $freeSpace); From 5209cff371c448a5fec75882044b7a8e3ed05f95 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 25 Jul 2013 16:01:05 +0200 Subject: [PATCH 08/13] add conveince function to wrap all storages --- lib/files/filesystem.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php index 4281ebba99..10ec5c41d1 100644 --- a/lib/files/filesystem.php +++ b/lib/files/filesystem.php @@ -149,6 +149,18 @@ class Filesystem { */ private static $loader; + /** + * @param callable $wrapper + */ + public static function addStorageWrapper($wrapper) { + self::getLoader()->addStorageWrapper($wrapper); + + $mounts = self::getMountManager()->getAll(); + foreach ($mounts as $mount) { + $mount->wrapStorage($wrapper); + } + } + public static function getLoader() { if (!self::$loader) { self::$loader = new Loader(); From e2f04b3b429b42975f4457b77ca720396506e512 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 25 Jul 2013 16:01:37 +0200 Subject: [PATCH 09/13] use storage wrapper for quota instead of a filesystem proxy --- lib/util.php | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/lib/util.php b/lib/util.php index 2586ad2832..4c878f8b2f 100755 --- a/lib/util.php +++ b/lib/util.php @@ -46,6 +46,16 @@ class OC_Util { } if( $user != "" ) { //if we aren't logged in, there is no use to set up the filesystem + $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; + } + }); + } $user_dir = '/'.$user.'/files'; $user_root = OC_User::getHome($user); $userdirectory = $user_root . '/files'; @@ -55,9 +65,7 @@ class OC_Util { //jail the user into his "home" directory \OC\Files\Filesystem::init($user, $user_dir); - $quotaProxy=new OC_FileProxy_Quota(); $fileOperationProxy = new OC_FileProxy_FileOperations(); - OC_FileProxy::register($quotaProxy); OC_FileProxy::register($fileOperationProxy); OC_Hook::emit('OC_Filesystem', 'setup', array('user' => $user, 'user_dir' => $user_dir)); @@ -65,6 +73,18 @@ class OC_Util { return true; } + public static function getUserQuota($user){ + $userQuota = OC_Preferences::getValue($user, 'files', 'quota', 'default'); + if($userQuota === 'default') { + $userQuota = OC_AppConfig::getValue('files', 'default_quota', 'none'); + } + if($userQuota === 'none') { + return \OC\Files\SPACE_UNLIMITED; + }else{ + return OC_Helper::computerFileSize($userQuota); + } + } + public static function tearDownFS() { \OC\Files\Filesystem::tearDown(); self::$fsSetup=false; From 88cc2ccb3b8ab4bb8a475e82756d8dc13db69b32 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 25 Jul 2013 16:14:46 +0200 Subject: [PATCH 10/13] use renamed constants --- apps/files_external/lib/google.php | 4 ++-- apps/files_external/lib/webdav.php | 2 +- apps/files_sharing/lib/sharedstorage.php | 2 +- lib/connector/sabre/quotaplugin.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php index ef8dd6d8ca..3ce3c38389 100644 --- a/apps/files_external/lib/google.php +++ b/apps/files_external/lib/google.php @@ -284,7 +284,7 @@ class Google extends \OC\Files\Storage\Common { // Check if this is a Google Doc if ($this->getMimeType($path) !== $file->getMimeType()) { // Return unknown file size - $stat['size'] = \OC\Files\FREE_SPACE_UNKNOWN; + $stat['size'] = \OC\Files\SPACE_UNKNOWN; } else { $stat['size'] = $file->getFileSize(); } @@ -587,4 +587,4 @@ class Google extends \OC\Files\Storage\Common { return false; } -} \ No newline at end of file +} diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php index 4869322d87..57ff3707d3 100644 --- a/apps/files_external/lib/webdav.php +++ b/apps/files_external/lib/webdav.php @@ -224,7 +224,7 @@ class DAV extends \OC\Files\Storage\Common{ return 0; } } catch(\Exception $e) { - return \OC\Files\FREE_SPACE_UNKNOWN; + return \OC\Files\SPACE_UNKNOWN; } } diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php index 5c23a9eb0d..7384b094cb 100644 --- a/apps/files_sharing/lib/sharedstorage.php +++ b/apps/files_sharing/lib/sharedstorage.php @@ -391,7 +391,7 @@ class Shared extends \OC\Files\Storage\Common { public function free_space($path) { if ($path == '') { - return \OC\Files\FREE_SPACE_UNKNOWN; + return \OC\Files\SPACE_UNKNOWN; } $source = $this->getSourcePath($path); if ($source) { diff --git a/lib/connector/sabre/quotaplugin.php b/lib/connector/sabre/quotaplugin.php index c80a33d04b..34d4b67615 100644 --- a/lib/connector/sabre/quotaplugin.php +++ b/lib/connector/sabre/quotaplugin.php @@ -51,7 +51,7 @@ class OC_Connector_Sabre_QuotaPlugin extends Sabre_DAV_ServerPlugin { } list($parentUri, $newName) = Sabre_DAV_URLUtil::splitPath($uri); $freeSpace = \OC\Files\Filesystem::free_space($parentUri); - if ($freeSpace !== \OC\Files\FREE_SPACE_UNKNOWN && $length > $freeSpace) { + if ($freeSpace !== \OC\Files\SPACE_UNKNOWN && $length > $freeSpace) { throw new Sabre_DAV_Exception_InsufficientStorage(); } } From 8f10c9571f96eeaf6dbc2b6fa31071bc5f735b61 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Fri, 16 Aug 2013 15:48:45 +0200 Subject: [PATCH 11/13] fix quota wrapper reporting negative free_space, breaking user interface return 0 instead --- lib/files/storage/wrapper/quota.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/files/storage/wrapper/quota.php b/lib/files/storage/wrapper/quota.php index bc2d893976..e2da8cf2e0 100644 --- a/lib/files/storage/wrapper/quota.php +++ b/lib/files/storage/wrapper/quota.php @@ -48,7 +48,7 @@ class Quota extends Wrapper { return \OC\Files\SPACE_NOT_COMPUTED; } else { $free = $this->storage->free_space($path); - return min($free, ($this->quota - $used)); + return min($free, (max($this->quota - $used, 0))); } } } From 5c9aedac1b9e858e450ac0b1f009d8042206060b Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Fri, 16 Aug 2013 15:50:50 +0200 Subject: [PATCH 12/13] remove outdated quota proxy --- lib/fileproxy/quota.php | 114 ---------------------------------------- 1 file changed, 114 deletions(-) delete mode 100644 lib/fileproxy/quota.php diff --git a/lib/fileproxy/quota.php b/lib/fileproxy/quota.php deleted file mode 100644 index 3dac3264fb..0000000000 --- a/lib/fileproxy/quota.php +++ /dev/null @@ -1,114 +0,0 @@ -. -* -*/ - -/** - * user quota management - */ - -class OC_FileProxy_Quota extends OC_FileProxy{ - static $rootView; - private $userQuota=array(); - - /** - * get the quota for the user - * @param user - * @return int - */ - private function getQuota($user) { - if(in_array($user, $this->userQuota)) { - return $this->userQuota[$user]; - } - $userQuota=OC_Preferences::getValue($user, 'files', 'quota', 'default'); - if($userQuota=='default') { - $userQuota=OC_AppConfig::getValue('files', 'default_quota', 'none'); - } - if($userQuota=='none') { - $this->userQuota[$user]=-1; - }else{ - $this->userQuota[$user]=OC_Helper::computerFileSize($userQuota); - } - return $this->userQuota[$user]; - - } - - /** - * get the free space in the path's owner home folder - * @param path - * @return int - */ - private function getFreeSpace($path) { - /** - * @var \OC\Files\Storage\Storage $storage - * @var string $internalPath - */ - list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath($path); - $owner = $storage->getOwner($internalPath); - if (!$owner) { - return -1; - } - - $totalSpace = $this->getQuota($owner); - if($totalSpace == -1) { - return -1; - } - - $view = new \OC\Files\View("/".$owner."/files"); - - $rootInfo = $view->getFileInfo('/'); - $usedSpace = isset($rootInfo['size'])?$rootInfo['size']:0; - return $totalSpace - $usedSpace; - } - - public function postFree_space($path, $space) { - $free=$this->getFreeSpace($path); - if($free==-1) { - return $space; - } - if ($space < 0){ - return $free; - } - return min($free, $space); - } - - public function preFile_put_contents($path, $data) { - if (is_resource($data)) { - $data = '';//TODO: find a way to get the length of the stream without emptying it - } - return (strlen($data)<$this->getFreeSpace($path) or $this->getFreeSpace($path)==-1); - } - - public function preCopy($path1, $path2) { - if(!self::$rootView) { - self::$rootView = new \OC\Files\View(''); - } - return (self::$rootView->filesize($path1)<$this->getFreeSpace($path2) or $this->getFreeSpace($path2)==-1); - } - - public function preFromTmpFile($tmpfile, $path) { - return (filesize($tmpfile)<$this->getFreeSpace($path) or $this->getFreeSpace($path)==-1); - } - - public function preFromUploadedFile($tmpfile, $path) { - return (filesize($tmpfile)<$this->getFreeSpace($path) or $this->getFreeSpace($path)==-1); - } -} From 89c928c3bef9a44135b18b83deb61dac87bd5d6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Mon, 19 Aug 2013 11:09:55 +0200 Subject: [PATCH 13/13] replace ' ' with '%20' in urls for curl --- apps/files_external/lib/webdav.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php index f98be318f1..74a323af28 100644 --- a/apps/files_external/lib/webdav.php +++ b/apps/files_external/lib/webdav.php @@ -171,7 +171,7 @@ class DAV extends \OC\Files\Storage\Common{ $curl = curl_init(); $fp = fopen('php://temp', 'r+'); curl_setopt($curl, CURLOPT_USERPWD, $this->user.':'.$this->password); - curl_setopt($curl, CURLOPT_URL, $this->createBaseUri().$path); + curl_setopt($curl, CURLOPT_URL, $this->createBaseUri().str_replace(' ', '%20', $path)); curl_setopt($curl, CURLOPT_FILE, $fp); curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true); @@ -256,7 +256,7 @@ class DAV extends \OC\Files\Storage\Common{ $curl = curl_init(); curl_setopt($curl, CURLOPT_USERPWD, $this->user.':'.$this->password); - curl_setopt($curl, CURLOPT_URL, $this->createBaseUri().$target); + curl_setopt($curl, CURLOPT_URL, $this->createBaseUri().str_replace(' ', '%20', $target)); curl_setopt($curl, CURLOPT_BINARYTRANSFER, true); curl_setopt($curl, CURLOPT_INFILE, $source); // file pointer curl_setopt($curl, CURLOPT_INFILESIZE, filesize($path));