From fe0849ebad1db0863875d8889e79d61497e1bd6f Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Thu, 27 Mar 2025 11:16:17 +0100 Subject: [PATCH] fix(dav): Give proper HTTP status code on MKCOL when quota exceeded Signed-off-by: Marcel Klehr --- apps/dav/lib/Connector/Sabre/QuotaPlugin.php | 34 +++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/apps/dav/lib/Connector/Sabre/QuotaPlugin.php b/apps/dav/lib/Connector/Sabre/QuotaPlugin.php index deaa4cf672b4b..5bb0f9cac3194 100644 --- a/apps/dav/lib/Connector/Sabre/QuotaPlugin.php +++ b/apps/dav/lib/Connector/Sabre/QuotaPlugin.php @@ -14,6 +14,8 @@ use Sabre\DAV\Exception\InsufficientStorage; use Sabre\DAV\Exception\ServiceUnavailable; use Sabre\DAV\INode; +use Sabre\HTTP\RequestInterface; +use Sabre\HTTP\ResponseInterface; /** * This plugin check user quota and deny creating files when they exceeds the quota. @@ -56,6 +58,7 @@ public function initialize(\Sabre\DAV\Server $server) { $server->on('beforeWriteContent', [$this, 'beforeWriteContent'], 10); $server->on('beforeCreateFile', [$this, 'beforeCreateFile'], 10); + $server->on('method:MKCOL', [$this, 'onCreateCollection'], 30); $server->on('beforeMove', [$this, 'beforeMove'], 10); $server->on('beforeCopy', [$this, 'beforeCopy'], 10); } @@ -89,6 +92,31 @@ public function beforeCreateFile($uri, $data, INode $parent, $modified) { return $this->checkQuota($parent->getPath() . '/' . basename($uri)); } + /** + * Check quota before creating directory + * + * @param RequestInterface $request + * @param ResponseInterface $response + * @return bool + * @throws InsufficientStorage + * @throws \Sabre\DAV\Exception\Forbidden + */ + public function onCreateCollection(RequestInterface $request, ResponseInterface $response): bool { + try { + $destinationPath = $this->server->calculateUri($request->getUrl()); + $quotaPath = $this->getPathForDestination($destinationPath); + } catch (\Exception $e) { + return true; + } + if ($quotaPath) { + // MKCOL does not have a Content-Length header, so we can use + // a fixed value for the quota check. + return $this->checkQuota($quotaPath, 4096, true); + } + + return true; + } + /** * Check quota before writing content * @@ -175,7 +203,7 @@ private function getPathForDestination(string $destinationPath): string { * @throws InsufficientStorage * @return bool */ - public function checkQuota(string $path, $length = null) { + public function checkQuota(string $path, $length = null, $isDir = false) { if ($length === null) { $length = $this->getLength(); } @@ -192,6 +220,10 @@ public function checkQuota(string $path, $length = null) { $freeSpace = $this->getFreeSpace($path); if ($freeSpace >= 0 && $length > $freeSpace) { + if ($isDir) { + throw new InsufficientStorage("Insufficient space in $path. $freeSpace available. Cannot create directory"); + } + throw new InsufficientStorage("Insufficient space in $path, $length required, $freeSpace available"); } }