From d9c14292a4f588cbd2f47a70116ee6e680854b08 Mon Sep 17 00:00:00 2001 From: scambra Date: Fri, 20 Apr 2012 11:39:30 +0200 Subject: [PATCH 1/2] fix checking quota in webdav, adding a sabredav plugin --- apps/files/appinfo/remote.php | 1 + lib/connector/sabre/quotaplugin.php | 57 +++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 lib/connector/sabre/quotaplugin.php diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php index 9c7b9ab6d5..ecabe8621d 100644 --- a/apps/files/appinfo/remote.php +++ b/apps/files/appinfo/remote.php @@ -41,6 +41,7 @@ $server->setBaseUri($baseuri); $server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend, 'ownCloud')); $server->addPlugin(new Sabre_DAV_Locks_Plugin($lockBackend)); $server->addPlugin(new Sabre_DAV_Browser_Plugin(false)); // Show something in the Browser, but no upload +$server->addPlugin(new OC_Connector_Sabre_QuotaPlugin()); // And off we go! $server->exec(); diff --git a/lib/connector/sabre/quotaplugin.php b/lib/connector/sabre/quotaplugin.php new file mode 100644 index 0000000000..67177c2aec --- /dev/null +++ b/lib/connector/sabre/quotaplugin.php @@ -0,0 +1,57 @@ +server = $server; + $this->server->subscribeEvent('beforeWriteContent',array($this,'checkQuota'),10); + $this->server->subscribeEvent('beforeCreateFile',array($this,'checkQuota'),10); + + } + + /** + * This method is called before any HTTP method and forces users to be authenticated + * + * @param string $method + * @throws Sabre_DAV_Exception + * @return bool + */ + public function checkQuota($uri, $data = null) { + $expected = $this->server->httpRequest->getHeader('X-Expected-Entity-Length'); + $length = $expected ? $expected : $this->server->httpRequest->getHeader('Content-Length'); + if ($length) { + if(substr($uri,0,1)!=='/') $uri='/'.$uri; + list($parentUri,$newName) = Sabre_DAV_URLUtil::splitPath($uri); + if ($length > OC_Filesystem::free_space($parentUri)) { + throw new Sabre_DAV_Exception('Quota exceeded. File is too big.'); + } + } + return true; + } +} From 5af8adc1695b25f2e5d290991fe2c1187cd4d1df Mon Sep 17 00:00:00 2001 From: scambra Date: Tue, 30 Oct 2012 12:17:15 +0100 Subject: [PATCH 2/2] code style changes --- lib/connector/sabre/quotaplugin.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/connector/sabre/quotaplugin.php b/lib/connector/sabre/quotaplugin.php index 67177c2aec..5b8ef94171 100644 --- a/lib/connector/sabre/quotaplugin.php +++ b/lib/connector/sabre/quotaplugin.php @@ -30,8 +30,8 @@ class OC_Connector_Sabre_QuotaPlugin extends Sabre_DAV_ServerPlugin { 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->subscribeEvent('beforeWriteContent', array($this, 'checkQuota'), 10); + $this->server->subscribeEvent('beforeCreateFile', array($this, 'checkQuota'), 10); } @@ -46,8 +46,10 @@ class OC_Connector_Sabre_QuotaPlugin extends Sabre_DAV_ServerPlugin { $expected = $this->server->httpRequest->getHeader('X-Expected-Entity-Length'); $length = $expected ? $expected : $this->server->httpRequest->getHeader('Content-Length'); if ($length) { - if(substr($uri,0,1)!=='/') $uri='/'.$uri; - list($parentUri,$newName) = Sabre_DAV_URLUtil::splitPath($uri); + if (substr($uri, 0, 1)!=='/') { + $uri='/'.$uri; + } + list($parentUri, $newName) = Sabre_DAV_URLUtil::splitPath($uri); if ($length > OC_Filesystem::free_space($parentUri)) { throw new Sabre_DAV_Exception('Quota exceeded. File is too big.'); }