1 files changed, 37 insertions, 26 deletions

diff --git a/apps/dav/lib/Connector/Sabre/QuotaPlugin.php b/apps/dav/lib/Connector/Sabre/QuotaPlugin.php
index ea6fc12e1cb..bbb378edc9b 100644
--- a/apps/dav/lib/Connector/Sabre/QuotaPlugin.php
+++ b/apps/dav/lib/Connector/Sabre/QuotaPlugin.php
@@ -8,12 +8,15 @@
  */
 namespace OCA\DAV\Connector\Sabre;
 
+use OC\Files\View;
 use OCA\DAV\Upload\FutureFile;
 use OCA\DAV\Upload\UploadFolder;
 use OCP\Files\StorageNotAvailableException;
 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.
@@ -23,9 +26,6 @@ use Sabre\DAV\INode;
  * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
  */
 class QuotaPlugin extends \Sabre\DAV\ServerPlugin {
-	/** @var \OC\Files\View */
-	private $view;
-
 	/**
 	 * Reference to main server object
 	 *
@@ -34,10 +34,11 @@ class QuotaPlugin extends \Sabre\DAV\ServerPlugin {
 	private $server;
 
 	/**
-	 * @param \OC\Files\View $view
+	 * @param View $view
 	 */
-	public function __construct($view) {
-		$this->view = $view;
+	public function __construct(
+		private $view,
+	) {
 	}
 
 	/**
@@ -56,6 +57,7 @@ class QuotaPlugin extends \Sabre\DAV\ServerPlugin {
 
 		$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);
 	}
@@ -90,6 +92,31 @@ class QuotaPlugin extends \Sabre\DAV\ServerPlugin {
 	}
 
 	/**
+	 * 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
 	 *
 	 * @param string $uri target file URI
@@ -175,7 +202,7 @@ class QuotaPlugin extends \Sabre\DAV\ServerPlugin {
 	 * @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();
 		}
@@ -187,26 +214,15 @@ class QuotaPlugin extends \Sabre\DAV\ServerPlugin {
 			}
 			$req = $this->server->httpRequest;
 
-			// If LEGACY chunked upload
-			if ($req->getHeader('OC-Chunked')) {
-				$info = \OC_FileChunking::decodeName($newName);
-				$chunkHandler = $this->getFileChunking($info);
-				// subtract the already uploaded size to see whether
-				// 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
-				$path = rtrim($parentPath, '/') . '/' . $info['name'];
-			}
-
 			// Strip any duplicate slashes
 			$path = str_replace('//', '/', $path);
 
 			$freeSpace = $this->getFreeSpace($path);
 			if ($freeSpace >= 0 && $length > $freeSpace) {
-				// If LEGACY chunked upload, clean up
-				if (isset($chunkHandler)) {
-					$chunkHandler->cleanup();
+				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");
 			}
 		}
@@ -214,11 +230,6 @@ class QuotaPlugin extends \Sabre\DAV\ServerPlugin {
 		return true;
 	}
 
-	public function getFileChunking($info) {
-		// FIXME: need a factory for better mocking support
-		return new \OC_FileChunking($info);
-	}
-
 	public function getLength() {
 		$req = $this->server->httpRequest;
 		$length = $req->getHeader('X-Expected-Entity-Length');