feat(preset): share link expiration date

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

Author: ArtificialOwl

apps/settings/lib/Settings/Admin/Sharing.php

@@ -62,9 +62,9 @@ public function getForm() {
 			'enforceLinksPasswordExcludedGroupsEnabled' => $this->config->getSystemValueBool('sharing.allow_disabled_password_enforcement_groups', false),
 			'onlyShareWithGroupMembers' => $this->shareManager->shareWithGroupMembersOnly(),
 			'onlyShareWithGroupMembersExcludeGroupList' => json_decode($onlyShareWithGroupMembersExcludeGroupList) ?? [],
-			'defaultExpireDate' => $this->getHumanBooleanConfig('core', 'shareapi_default_expire_date'),
+			'defaultExpireDate' => $this->appConfig->getValueBool('core', ConfigLexicon::SHARE_LINK_EXPIRE_DATE_DEFAULT),
 			'expireAfterNDays' => $this->config->getAppValue('core', 'shareapi_expire_after_n_days', '7'),
-			'enforceExpireDate' => $this->getHumanBooleanConfig('core', 'shareapi_enforce_expire_date'),
+			'enforceExpireDate' => $this->appConfig->getValueBool('core', ConfigLexicon::SHARE_LINK_EXPIRE_DATE_ENFORCED),
 			'excludeGroups' => $this->config->getAppValue('core', 'shareapi_exclude_groups', 'no'),
 			'excludeGroupsList' => json_decode($excludedGroups, true) ?? [],
 			'publicShareDisclaimerText' => $this->config->getAppValue('core', 'shareapi_public_link_disclaimertext'),

apps/settings/tests/Settings/Admin/SharingTest.php

@@ -59,6 +59,8 @@ public function testGetFormWithoutExcludedGroups(): void {
 			->willReturnMap([
 				['core', 'shareapi_allow_federation_on_public_shares', true],
 				['core', 'shareapi_enable_link_password_by_default', true],
+				['core', 'shareapi_default_expire_date', false],
+				['core', 'shareapi_enforce_expire_date', false],
 			]);
 
 		$this->config
@@ -78,9 +80,7 @@ public function testGetFormWithoutExcludedGroups(): void {
 				['core', 'shareapi_restrict_user_enumeration_full_match_email', 'yes', 'yes'],
 				['core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_dn', 'no', 'no'],
 				['core', 'shareapi_enabled', 'yes', 'yes'],
-				['core', 'shareapi_default_expire_date', 'no', 'no'],
 				['core', 'shareapi_expire_after_n_days', '7', '7'],
-				['core', 'shareapi_enforce_expire_date', 'no', 'no'],
 				['core', 'shareapi_exclude_groups', 'no', 'no'],
 				['core', 'shareapi_public_link_disclaimertext', '', 'Lorem ipsum'],
 				['core', 'shareapi_default_permissions', (string)Constants::PERMISSION_ALL, Constants::PERMISSION_ALL],

core/AppInfo/ConfigLexicon.php

@@ -24,7 +24,8 @@ class ConfigLexicon implements ILexicon {
 	public const SHARE_CUSTOM_TOKEN = 'shareapi_allow_custom_tokens';
 	public const SHARE_LINK_PASSWORD_DEFAULT = 'shareapi_enable_link_password_by_default';
 	public const SHARE_LINK_PASSWORD_ENFORCED = 'shareapi_enforce_links_password';
-
+	public const SHARE_LINK_EXPIRE_DATE_DEFAULT = 'shareapi_default_expire_date';
+	public const SHARE_LINK_EXPIRE_DATE_ENFORCED = 'shareapi_enforce_expire_date';
 	public const USER_LANGUAGE = 'lang';
 	public const LASTCRON_TIMESTAMP = 'lastcron';
 
@@ -62,6 +63,24 @@ public function getAppConfigs(): array {
 				},
 				definition: 'Enforce password protection when sharing document'
 			),
+			new Entry(
+				key: self::SHARE_LINK_EXPIRE_DATE_DEFAULT,
+				type: ValueType::BOOL,
+				defaultRaw: fn (Preset $p): bool => match ($p) {
+					Preset::SHARED, Preset::SMALL, Preset::MEDIUM, Preset::LARGE => true,
+					default => false,
+				},
+				definition: 'Set default expiration date for shares via link or mail'
+			),
+			new Entry(
+				key: self::SHARE_LINK_EXPIRE_DATE_ENFORCED,
+				type: ValueType::BOOL,
+				defaultRaw: fn (Preset $p): bool => match ($p) {
+					Preset::SHARED, Preset::SMALL, Preset::MEDIUM, Preset::LARGE => true,
+					default => false,
+				},
+				definition: 'Enforce expiration date for shares via link or mail'
+			),
 			new Entry(self::LASTCRON_TIMESTAMP, ValueType::INT, 0, 'timestamp of last cron execution'),
 		];
 	}

lib/private/Share/Helper.php

@@ -7,23 +7,25 @@
  */
 namespace OC\Share;
 
+use OC\AppConfig;
+use OC\Core\AppInfo\ConfigLexicon;
+
 class Helper extends \OC\Share\Constants {
 	/**
 	 * get default expire settings defined by the admin
 	 * @return array contains 'defaultExpireDateSet', 'enforceExpireDate', 'expireAfterDays'
 	 */
 	public static function getDefaultExpireSetting() {
 		$config = \OC::$server->getConfig();
+		$appConfig = \OCP\Server::get(AppConfig::class);
 
 		$defaultExpireSettings = ['defaultExpireDateSet' => false];
 
 		// get default expire settings
-		$defaultExpireDate = $config->getAppValue('core', 'shareapi_default_expire_date', 'no');
-		if ($defaultExpireDate === 'yes') {
-			$enforceExpireDate = $config->getAppValue('core', 'shareapi_enforce_expire_date', 'no');
+		if ($appConfig->getValueBool('core', ConfigLexicon::SHARE_LINK_EXPIRE_DATE_DEFAULT)) {
 			$defaultExpireSettings['defaultExpireDateSet'] = true;
 			$defaultExpireSettings['expireAfterDays'] = (int)$config->getAppValue('core', 'shareapi_expire_after_n_days', '7');
-			$defaultExpireSettings['enforceExpireDate'] = $enforceExpireDate === 'yes';
+			$defaultExpireSettings['enforceExpireDate'] = $appConfig->getValueBool('core', ConfigLexicon::SHARE_LINK_EXPIRE_DATE_ENFORCED);
 		}
 
 		return $defaultExpireSettings;

lib/private/Share20/Manager.php

@@ -1787,18 +1787,17 @@ public function shareApiLinkEnforcePassword(bool $checkGroupMembership = true) {
 	 * @return bool
 	 */
 	public function shareApiLinkDefaultExpireDate() {
-		return $this->config->getAppValue('core', 'shareapi_default_expire_date', 'no') === 'yes';
+		return $this->appConfig->getValueBool('core', ConfigLexicon::SHARE_LINK_EXPIRE_DATE_DEFAULT);
 	}
 
 	/**
 	 * Is default link expire date enforced
-	 *`
 	 *
 	 * @return bool
 	 */
 	public function shareApiLinkDefaultExpireDateEnforced() {
 		return $this->shareApiLinkDefaultExpireDate()
-			&& $this->config->getAppValue('core', 'shareapi_enforce_expire_date', 'no') === 'yes';
+			&& $this->appConfig->getValueBool('core', ConfigLexicon::SHARE_LINK_EXPIRE_DATE_ENFORCED);
 	}
 
 

lib/private/Template/JSConfigHelper.php

@@ -98,11 +98,11 @@ public function getConfig(): string {
 		}
 
 		$enableLinkPasswordByDefault = $this->appConfig->getValueBool('core', ConfigLexicon::SHARE_LINK_PASSWORD_DEFAULT);
-		$defaultExpireDateEnabled = $this->config->getAppValue('core', 'shareapi_default_expire_date', 'no') === 'yes';
+		$defaultExpireDateEnabled = $this->appConfig->getValueBool('core', ConfigLexicon::SHARE_LINK_EXPIRE_DATE_DEFAULT);
 		$defaultExpireDate = $enforceDefaultExpireDate = null;
 		if ($defaultExpireDateEnabled) {
 			$defaultExpireDate = (int)$this->config->getAppValue('core', 'shareapi_expire_after_n_days', '7');
-			$enforceDefaultExpireDate = $this->config->getAppValue('core', 'shareapi_enforce_expire_date', 'no') === 'yes';
+			$enforceDefaultExpireDate = $this->appConfig->getValueBool('core', ConfigLexicon::SHARE_LINK_EXPIRE_DATE_ENFORCED);
 		}
 		$outgoingServer2serverShareEnabled = $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') === 'yes';