refs #21045 add app config to disable unlimited quota and to set max …

…quota avoid unlimited quota as default_quota fallback value if unlimited quota is not allowed avoid getting/setting/displaying unlimited default quota if not allowed implement tests for unlimited quota restrictions Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
nextcloud · Jul 30, 2021 · e64ca81 · e64ca81
1 parent f0ca1f7
commit e64ca81
Show file tree

Hide file tree

Showing 9 changed files with 111 additions and 6 deletions.
diff --git a/apps/provisioning_api/lib/Controller/AppConfigController.php b/apps/provisioning_api/lib/Controller/AppConfigController.php
@@ -162,5 +162,12 @@ protected function verifyConfigKey(string $app, string $key, string $value) {
 		if ($app === 'core' && (strpos($key, 'public_') === 0 || strpos($key, 'remote_') === 0)) {
 			throw new \InvalidArgumentException('The given key can not be set');
 		}
+
+		if ($app === 'files'
+			&& $key === 'default_quota'
+			&& $value === 'none'
+			&& $this->config->getAppValue('files', 'allow_unlimited_quota', '1') === '0') {
+			throw new \InvalidArgumentException('The given key can not be set, unlimited quota is forbidden on this instance');
+		}
 	}
 }
diff --git a/apps/provisioning_api/lib/Controller/UsersController.php b/apps/provisioning_api/lib/Controller/UsersController.php
@@ -798,9 +798,20 @@ public function editUser(string $userId, string $key, string $value): DataRespon
 					if ($quota === -1) {
 						$quota = 'none';
 					} else {
+						$maxQuota = (int) $this->config->getAppValue('files', 'max_quota', '-1');
+						if ($maxQuota !== -1 && $quota > $maxQuota) {
+							throw new OCSException('Invalid quota value. ' . $value . ' is exceeding the maximum quota', 102);
+						}
 						$quota = \OCP\Util::humanFileSize($quota);
 					}
 				}
+				// no else block because quota can be set to 'none' in previous if
+				if ($quota === 'none') {
+					$allowUnlimitedQuota = $this->config->getAppValue('files', 'allow_unlimited_quota', '1') === '1';
+					if (!$allowUnlimitedQuota) {
+						throw new OCSException('Unlimited quota is forbidden on this instance', 102);
+					}
+				}
 				$targetUser->setQuota($quota);
 				break;
 			case 'password':

diff --git a/apps/settings/js/vue-settings-apps-users-management.js b/apps/settings/js/vue-settings-apps-users-management.js
diff --git a/apps/settings/js/vue-settings-apps-users-management.js.map b/apps/settings/js/vue-settings-apps-users-management.js.map
diff --git a/apps/settings/lib/Controller/UsersController.php b/apps/settings/lib/Controller/UsersController.php
@@ -243,7 +243,12 @@ public function usersList(): TemplateResponse {
 
 		/* QUOTAS PRESETS */
 		$quotaPreset = $this->parseQuotaPreset($this->config->getAppValue('files', 'quota_preset', '1 GB, 5 GB, 10 GB'));
-		$defaultQuota = $this->config->getAppValue('files', 'default_quota', 'none');
+		$allowUnlimitedQuota = $this->config->getAppValue('files', 'allow_unlimited_quota', '1') === '1';
+		if (!$allowUnlimitedQuota && count($quotaPreset) > 0) {
+			$defaultQuota = $this->config->getAppValue('files', 'default_quota', $quotaPreset[0]);
+		} else {
+			$defaultQuota = $this->config->getAppValue('files', 'default_quota', 'none');
+		}
 
 		$event = new BeforeTemplateRenderedEvent();
 		$this->dispatcher->dispatch('OC\Settings\Users::loadAdditionalScripts', $event);
@@ -260,6 +265,7 @@ public function usersList(): TemplateResponse {
 		$serverData['isAdmin'] = $this->isAdmin;
 		$serverData['sortGroups'] = $sortGroupsBy;
 		$serverData['quotaPreset'] = $quotaPreset;
+		$serverData['allowUnlimitedQuota'] = $allowUnlimitedQuota;
 		$serverData['userCount'] = $userCount;
 		$serverData['languages'] = $languages;
 		$serverData['defaultLanguage'] = $this->config->getSystemValue('default_language', 'en');

diff --git a/apps/settings/src/components/UserList.vue b/apps/settings/src/components/UserList.vue
@@ -345,7 +345,9 @@ export default {
 				label: cur,
 			}), [])
 			// add default presets
-			quotaPreset.unshift(this.unlimitedQuota)
+			if (this.settings.allowUnlimitedQuota) {
+				quotaPreset.unshift(this.unlimitedQuota)
+			}
 			quotaPreset.unshift(this.defaultQuota)
 			return quotaPreset
 		},

diff --git a/apps/settings/src/views/Users.vue b/apps/settings/src/views/Users.vue
@@ -274,7 +274,9 @@ export default {
 			// convert the preset array into objects
 			const quotaPreset = this.settings.quotaPreset.reduce((acc, cur) => acc.concat({ id: cur, label: cur }), [])
 			// add default presets
-			quotaPreset.unshift(this.unlimitedQuota)
+			if (this.settings.allowUnlimitedQuota) {
+				quotaPreset.unshift(this.unlimitedQuota)
+			}
 			return quotaPreset
 		},
 		// mapping saved values to objects

diff --git a/lib/private/User/User.php b/lib/private/User/User.php
@@ -411,6 +411,18 @@ public function getQuota() {
 		}
 		if ($quota === 'default') {
 			$quota = $this->config->getAppValue('files', 'default_quota', 'none');
+
+			// if unlimited quota is not allowed => avoid getting 'unlimited' as default_quota fallback value
+			// use the first preset instead
+			$allowUnlimitedQuota = $this->config->getAppValue('files', 'allow_unlimited_quota', '1') === '1';
+			if (!$allowUnlimitedQuota) {
+				$presets = $this->config->getAppValue('files', 'quota_preset', '1 GB, 5 GB, 10 GB');
+				$presets = array_filter(array_map('trim', explode(',', $presets)));
+				$quotaPreset = array_values(array_diff($presets, ['default', 'none']));
+				if (count($quotaPreset) > 0) {
+					$quota = $this->config->getAppValue('files', 'default_quota', $quotaPreset[0]);
+				}
+			}
 		}
 		return $quota;
 	}

diff --git a/tests/lib/User/UserTest.php b/tests/lib/User/UserTest.php
@@ -724,6 +724,71 @@ public function testSetQuota() {
 		$user->setQuota('23 TB');
 	}
 
+	public function testGetDefaultUnlimitedQuota() {
+		/**
+		 * @var UserInterface | \PHPUnit\Framework\MockObject\MockObject $backend
+		 */
+		$backend = $this->createMock(\Test\Util\User\Dummy::class);
+
+		/** @var PublicEmitter|\PHPUnit\Framework\MockObject\MockObject $emitter */
+		$emitter = $this->createMock(PublicEmitter::class);
+		$emitter->expects($this->never())
+			->method('emit');
+
+		$config = $this->createMock(IConfig::class);
+		$user = new User('foo', $backend, $this->dispatcher, $emitter, $config);
+
+		$userValueMap = [
+			['foo', 'files', 'quota', 'default', 'default'],
+		];
+		$appValueMap = [
+			['files', 'default_quota', 'none', 'none'],
+			// allow unlimited quota
+			['files', 'allow_unlimited_quota', '1', '1'],
+		];
+		$config->method('getUserValue')
+			->will($this->returnValueMap($userValueMap));
+		$config->method('getAppValue')
+			->will($this->returnValueMap($appValueMap));
+
+		$quota = $user->getQuota();
+		$this->assertEquals('none', $quota);
+	}
+
+	public function testGetDefaultUnlimitedQuotaForbidden() {
+		/**
+		 * @var UserInterface | \PHPUnit\Framework\MockObject\MockObject $backend
+		 */
+		$backend = $this->createMock(\Test\Util\User\Dummy::class);
+
+		/** @var PublicEmitter|\PHPUnit\Framework\MockObject\MockObject $emitter */
+		$emitter = $this->createMock(PublicEmitter::class);
+		$emitter->expects($this->never())
+			->method('emit');
+
+		$config = $this->createMock(IConfig::class);
+		$user = new User('foo', $backend, $this->dispatcher, $emitter, $config);
+
+		$userValueMap = [
+			['foo', 'files', 'quota', 'default', 'default'],
+		];
+		$appValueMap = [
+			['files', 'default_quota', 'none', 'none'],
+			// do not allow unlimited quota
+			['files', 'allow_unlimited_quota', '1', '0'],
+			['files', 'quota_preset', '1 GB, 5 GB, 10 GB', '1 GB, 5 GB, 10 GB'],
+			// expect seeing 1 GB used as fallback value
+			['files', 'default_quota', '1 GB', '1 GB'],
+		];
+		$config->method('getUserValue')
+			->will($this->returnValueMap($userValueMap));
+		$config->method('getAppValue')
+			->will($this->returnValueMap($appValueMap));
+
+		$quota = $user->getQuota();
+		$this->assertEquals('1 GB', $quota);
+	}
+
 	public function testSetQuotaAddressNoChange() {
 		/**
 		 * @var UserInterface | \PHPUnit\Framework\MockObject\MockObject $backend