Merge pull request #19436 from nextcloud/bugfix/noid/dav-quota-calcul…

…ation Do not include mountpoints when calculating quota usage on WebDAV
nextcloud · Apr 30, 2020 · b8b53a2 · b8b53a2
2 parents a1f3293 + 902d125
commit b8b53a2
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 11 deletions.
diff --git a/apps/dav/lib/Connector/Sabre/Directory.php b/apps/dav/lib/Connector/Sabre/Directory.php
@@ -326,7 +326,8 @@ public function getQuotaInfo() {
 			return $this->quotaInfo;
 		}
 		try {
-			$storageInfo = \OC_Helper::getStorageInfo($this->info->getPath(), $this->info);
+			$info = $this->fileView->getFileInfo($this->path, false);
+			$storageInfo = \OC_Helper::getStorageInfo($this->info->getPath(), $info);
 			if ($storageInfo['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED) {
 				$free = \OCP\Files\FileInfo::SPACE_UNLIMITED;
 			} else {

diff --git a/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php b/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php
@@ -98,7 +98,7 @@ private function getDir($path = '/') {
 		return new Directory($this->view, $this->info);
 	}
 
-	
+
 	public function testDeleteRootFolderFails() {
 		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
 
@@ -111,7 +111,7 @@ public function testDeleteRootFolderFails() {
 		$dir->delete();
 	}
 
-	
+
 	public function testDeleteForbidden() {
 		$this->expectException(\OCA\DAV\Connector\Sabre\Exception\Forbidden::class);
 
@@ -130,7 +130,7 @@ public function testDeleteForbidden() {
 		$dir->delete();
 	}
 
-	
+
 	public function testDeleteFolderWhenAllowed() {
 		// deletion allowed
 		$this->info->expects($this->once())
@@ -147,7 +147,7 @@ public function testDeleteFolderWhenAllowed() {
 		$dir->delete();
 	}
 
-	
+
 	public function testDeleteFolderFailsWhenNotAllowed() {
 		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
 
@@ -159,7 +159,7 @@ public function testDeleteFolderFailsWhenNotAllowed() {
 		$dir->delete();
 	}
 
-	
+
 	public function testDeleteFolderThrowsWhenDeletionFailed() {
 		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
 
@@ -217,7 +217,7 @@ public function testGetChildren() {
 		$dir->getChildren();
 	}
 
-	
+
 	public function testGetChildrenNoPermission() {
 		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
 
@@ -230,7 +230,7 @@ public function testGetChildrenNoPermission() {
 		$dir->getChildren();
 	}
 
-	
+
 	public function testGetChildNoPermission() {
 		$this->expectException(\Sabre\DAV\Exception\NotFound::class);
 
@@ -242,7 +242,7 @@ public function testGetChildNoPermission() {
 		$dir->getChild('test');
 	}
 
-	
+
 	public function testGetChildThrowStorageNotAvailableException() {
 		$this->expectException(\Sabre\DAV\Exception\ServiceUnavailable::class);
 
@@ -254,7 +254,7 @@ public function testGetChildThrowStorageNotAvailableException() {
 		$dir->getChild('.');
 	}
 
-	
+
 	public function testGetChildThrowInvalidPath() {
 		$this->expectException(\OCA\DAV\Connector\Sabre\Exception\InvalidPath::class);
 
@@ -295,6 +295,10 @@ public function testGetQuotaInfoUnlimited() {
 			->method('getStorage')
 			->willReturn($storage);
 
+		$this->view->expects($this->once())
+			->method('getFileInfo')
+			->willReturn($this->info);
+
 		$dir = new Directory($this->view, $this->info);
 		$this->assertEquals([200, -3], $dir->getQuotaInfo()); //200 used, unlimited
 	}
@@ -327,6 +331,10 @@ public function testGetQuotaInfoSpecific() {
 			->method('getStorage')
 			->willReturn($storage);
 
+		$this->view->expects($this->once())
+			->method('getFileInfo')
+			->willReturn($this->info);
+
 		$dir = new Directory($this->view, $this->info);
 		$this->assertEquals([200, 800], $dir->getQuotaInfo()); //200 used, 800 free
 	}
@@ -404,7 +412,7 @@ private function moveTest($source, $destination, $updatables, $deletables) {
 		$this->assertTrue($targetNode->moveInto(basename($destination), $source, $sourceNode));
 	}
 
-	
+
 	public function testFailingMove() {
 		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
 		$this->expectExceptionMessage('Could not copy directory b, target exists');