diff options
author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-08-08 13:33:00 +0200 |
---|---|---|
committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-08-08 13:33:00 +0200 |
commit | fed1792510ff11941765783653573f45fadc4c70 (patch) | |
tree | a9045c1a386d849ea11e8d5ccb0a1faaa5a106ef /lib/connector/sabre | |
parent | d3a69bf4c6baba563beceb225b9192a4e22c9c59 (diff) | |
download | nextcloud-server-fed1792510ff11941765783653573f45fadc4c70.tar.gz nextcloud-server-fed1792510ff11941765783653573f45fadc4c70.zip |
adding unit tests for quota checks
Diffstat (limited to 'lib/connector/sabre')
-rw-r--r-- | lib/connector/sabre/quotaplugin.php | 75 |
1 files changed, 43 insertions, 32 deletions
diff --git a/lib/connector/sabre/quotaplugin.php b/lib/connector/sabre/quotaplugin.php index 730a86666be..eb95a839b86 100644 --- a/lib/connector/sabre/quotaplugin.php +++ b/lib/connector/sabre/quotaplugin.php @@ -3,45 +3,55 @@ /** * This plugin check user quota and deny creating files when they exceeds the quota. * - * @copyright Copyright (C) 2012 entreCables S.L. All rights reserved. * @author Sergio Cambra + * @copyright Copyright (C) 2012 entreCables S.L. All rights reserved. * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License */ class OC_Connector_Sabre_QuotaPlugin extends Sabre_DAV_ServerPlugin { /** - * Reference to main server object - * - * @var Sabre_DAV_Server - */ + * Reference to main server object + * + * @var Sabre_DAV_Server + */ private $server; /** - * This initializes the plugin. - * - * This function is called by Sabre_DAV_Server, after - * addPlugin is called. - * - * This method should set up the requires event subscriptions. - * - * @param Sabre_DAV_Server $server - * @return void - */ + * is kept public to allow overwrite for unit testing + * + * @var \OC\Files\View + */ + public $fileView; + + /** + * This initializes the plugin. + * + * This function is called by Sabre_DAV_Server, after + * addPlugin is called. + * + * This method should set up the requires event subscriptions. + * + * @param Sabre_DAV_Server $server + * @return void + */ public function initialize(Sabre_DAV_Server $server) { - $this->server = $server; - $this->server->subscribeEvent('beforeWriteContent', array($this, 'checkQuota'), 10); - $this->server->subscribeEvent('beforeCreateFile', array($this, 'checkQuota'), 10); + $this->server = $server; + $server->subscribeEvent('beforeWriteContent', array($this, 'checkQuota'), 10); + $server->subscribeEvent('beforeCreateFile', array($this, 'checkQuota'), 10); + + // initialize fileView + $this->fileView = \OC\Files\Filesystem::getView(); } /** - * This method is called before any HTTP method and forces users to be authenticated - * - * @param string $method - * @throws Sabre_DAV_Exception - * @return bool - */ + * This method is called before any HTTP method and validates there is enough free space to store the file + * + * @param string $method + * @throws Sabre_DAV_Exception + * @return bool + */ public function checkQuota($uri, $data = null) { $length = $this->getLength(); if ($length) { @@ -49,7 +59,7 @@ class OC_Connector_Sabre_QuotaPlugin extends Sabre_DAV_ServerPlugin { $uri='/'.$uri; } list($parentUri, $newName) = Sabre_DAV_URLUtil::splitPath($uri); - $freeSpace = \OC\Files\Filesystem::free_space($parentUri); + $freeSpace = $this->fileView->free_space($parentUri); if ($freeSpace !== \OC\Files\FREE_SPACE_UNKNOWN && $length > $freeSpace) { throw new Sabre_DAV_Exception_InsufficientStorage(); } @@ -59,15 +69,16 @@ class OC_Connector_Sabre_QuotaPlugin extends Sabre_DAV_ServerPlugin { public function getLength() { - $expected = $this->server->httpRequest->getHeader('X-Expected-Entity-Length'); - if ($expected) - return $expected; - - $length = $this->server->httpRequest->getHeader('Content-Length'); - $ocLength = $this->server->httpRequest->getHeader('OC-Total-Length'); + $req = $this->server->httpRequest; + $length = $req->getHeader('X-Expected-Entity-Length'); + if (!$length) { + $length = $req->getHeader('Content-Length'); + } - if ($length && $ocLength) + $ocLength = $req->getHeader('OC-Total-Length'); + if ($length && $ocLength) { return max($length, $ocLength); + } return $length; } |