From 76cd70aed7e70b9f5b8996a2333608709ea364bf Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Wed, 13 Sep 2017 13:12:16 +0200 Subject: [PATCH] Fix quota calculation on new dav upload endpoint Signed-off-by: Roeland Jago Douma --- apps/dav/lib/Connector/Sabre/QuotaPlugin.php | 94 +++++++++++++++---- .../dav/lib/Connector/Sabre/ServerFactory.php | 2 +- apps/dav/lib/Server.php | 2 +- .../unit/Connector/Sabre/QuotaPluginTest.php | 11 ++- 4 files changed, 88 insertions(+), 21 deletions(-) diff --git a/apps/dav/lib/Connector/Sabre/QuotaPlugin.php b/apps/dav/lib/Connector/Sabre/QuotaPlugin.php index f0958c353a..a41a4678f3 100644 --- a/apps/dav/lib/Connector/Sabre/QuotaPlugin.php +++ b/apps/dav/lib/Connector/Sabre/QuotaPlugin.php @@ -25,10 +25,14 @@ * */ namespace OCA\DAV\Connector\Sabre; +use OCA\DAV\Files\FilesHome; +use OCA\DAV\Upload\FutureFile; +use OCA\DAV\Upload\UploadFolder; use OCP\Files\FileInfo; use OCP\Files\StorageNotAvailableException; use Sabre\DAV\Exception\InsufficientStorage; use Sabre\DAV\Exception\ServiceUnavailable; +use Sabre\DAV\INode; use Sabre\HTTP\URLUtil; /** @@ -40,9 +44,7 @@ use Sabre\HTTP\URLUtil; */ class QuotaPlugin extends \Sabre\DAV\ServerPlugin { - /** - * @var \OC\Files\View - */ + /** @var \OC\Files\View */ private $view; /** @@ -74,26 +76,86 @@ class QuotaPlugin extends \Sabre\DAV\ServerPlugin { $this->server = $server; - $server->on('beforeWriteContent', array($this, 'checkQuota'), 10); - $server->on('beforeCreateFile', array($this, 'checkQuota'), 10); + $server->on('beforeWriteContent', [$this, 'beforeWriteContent'], 10); + $server->on('beforeCreateFile', [$this, 'beforeCreateFile'], 10); + $server->on('beforeMove', [$this, 'beforeMove'], 10); } + /** + * Check quota before creating file + * + * @param string $uri target file URI + * @param resource $data data + * @param INode $parent Sabre Node + * @param bool $modified modified + */ + public function beforeCreateFile($uri, $data, INode $parent, $modified) { + if (!$parent instanceof Node) { + return; + } + + return $this->checkQuota($parent->getPath() . '/' . basename($uri)); + } + + /** + * Check quota before writing content + * + * @param string $uri target file URI + * @param INode $node Sabre Node + * @param resource $data data + * @param bool $modified modified + */ + public function beforeWriteContent($uri, INode $node, $data, $modified) { + if (!$node instanceof Node) { + return; + } + + return $this->checkQuota($node->getPath()); + } + + /** + * Check if we're moving a Futurefile in which case we need to check + * the quota on the target destination. + * + * @param string $source source path + * @param string $destination destination path + */ + public function beforeMove($source, $destination) { + $sourceNode = $this->server->tree->getNodeForPath($source); + if (!$sourceNode instanceof FutureFile) { + return; + } + + // get target node for proper path conversion + if ($this->server->tree->nodeExists($destination)) { + $destinationNode = $this->server->tree->getNodeForPath($destination); + $path = $destinationNode->getPath(); + } else { + $parentNode = $this->server->tree->getNodeForPath(dirname($destination)); + $path = $parentNode->getPath(); + } + + return $this->checkQuota($path, $sourceNode->getSize()); + } + + /** * This method is called before any HTTP method and validates there is enough free space to store the file * - * @param string $uri + * @param string $path relative to the users home + * @param int $length * @throws InsufficientStorage * @return bool */ - public function checkQuota($uri) { - $length = $this->getLength(); + public function checkQuota($path, $length = null) { + if ($length === null) { + $length = $this->getLength(); + } + if ($length) { - if (substr($uri, 0, 1) !== '/') { - $uri = '/' . $uri; - } - list($parentUri, $newName) = URLUtil::splitPath($uri); - if(is_null($parentUri)) { - $parentUri = ''; + list($parentPath, $newName) = \Sabre\Uri\split($path); + if(is_null($parentPath)) { + $parentPath = ''; } $req = $this->server->httpRequest; if ($req->getHeader('OC-Chunked')) { @@ -103,9 +165,9 @@ class QuotaPlugin extends \Sabre\DAV\ServerPlugin { // there is still enough space for the remaining chunks $length -= $chunkHandler->getCurrentSize(); // use target file name for free space check in case of shared files - $uri = rtrim($parentUri, '/') . '/' . $info['name']; + $path = rtrim($parentPath, '/') . '/' . $info['name']; } - $freeSpace = $this->getFreeSpace($uri); + $freeSpace = $this->getFreeSpace($path); if ($freeSpace !== FileInfo::SPACE_UNKNOWN && $freeSpace !== FileInfo::SPACE_UNLIMITED && $length > $freeSpace) { if (isset($chunkHandler)) { $chunkHandler->cleanup(); diff --git a/apps/dav/lib/Connector/Sabre/ServerFactory.php b/apps/dav/lib/Connector/Sabre/ServerFactory.php index 329aa335ea..c120b0be2e 100644 --- a/apps/dav/lib/Connector/Sabre/ServerFactory.php +++ b/apps/dav/lib/Connector/Sabre/ServerFactory.php @@ -161,7 +161,7 @@ class ServerFactory { !$this->config->getSystemValue('debug', false) ) ); - $server->addPlugin(new \OCA\DAV\Connector\Sabre\QuotaPlugin($view)); + $server->addPlugin(new \OCA\DAV\Connector\Sabre\QuotaPlugin($view, true)); if($this->userSession->isLoggedIn()) { $server->addPlugin(new \OCA\DAV\Connector\Sabre\TagsPlugin($objectTree, $this->tagManager)); diff --git a/apps/dav/lib/Server.php b/apps/dav/lib/Server.php index 30c0a4afbd..02a306dacc 100644 --- a/apps/dav/lib/Server.php +++ b/apps/dav/lib/Server.php @@ -211,7 +211,7 @@ class Server { ); if ($view !== null) { $this->server->addPlugin( - new QuotaPlugin($view)); + new QuotaPlugin($view, false)); } $this->server->addPlugin( new TagsPlugin( diff --git a/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php index 6286362f47..d29080539e 100644 --- a/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php @@ -24,7 +24,13 @@ * */ namespace OCA\DAV\Tests\unit\Connector\Sabre; +use OC\Files\View; +use OCA\DAV\Connector\Sabre\Directory; +use OCA\DAV\Connector\Sabre\QuotaPlugin; +use OCA\DAV\Files\FilesHome; use OCP\Files\FileInfo; +use Sabre\DAV\Exception\InsufficientStorage; +use Sabre\DAV\Tree; use Test\TestCase; /** @@ -44,7 +50,7 @@ class QuotaPluginTest extends TestCase { private function init($quota, $checkedPath = '') { $view = $this->buildFileViewMock($quota, $checkedPath); $this->server = new \Sabre\DAV\Server(); - $this->plugin = $this->getMockBuilder('\OCA\DAV\Connector\Sabre\QuotaPlugin') + $this->plugin = $this->getMockBuilder(QuotaPlugin::class) ->setConstructorArgs([$view]) ->setMethods(['getFileChunking']) ->getMock(); @@ -224,7 +230,7 @@ class QuotaPluginTest extends TestCase { private function buildFileViewMock($quota, $checkedPath) { // mock filesysten - $view = $this->getMockBuilder('\OC\Files\View') + $view = $this->getMockBuilder(View::class) ->setMethods(['free_space']) ->disableOriginalConstructor() ->getMock(); @@ -235,5 +241,4 @@ class QuotaPluginTest extends TestCase { return $view; } - }