Adds a system config value to allow permanent share passwords

This commit is part of #31005

Signed-off-by: Cyrille Bollu <cyrpub@bollu.be>

Author: StCyr

apps/files_sharing/lib/Controller/ShareAPIController.php

@@ -278,6 +278,7 @@ protected function formatShare(IShare $share, Node $recipientNode = null): array
 		} elseif ($share->getShareType() === IShare::TYPE_EMAIL) {
 			$result['share_with'] = $share->getSharedWith();
 			$result['password'] = $share->getPassword();
+			$result['password_expiration_time'] = $share->getPasswordExpirationTime();
 			$result['send_password_by_talk'] = $share->getSendPasswordByTalk();
 			$result['share_with_displayname'] = $this->getDisplayNameFromAddressBook($share->getSharedWith(), 'EMAIL');
 			$result['token'] = $share->getToken();
@@ -561,6 +562,10 @@ public function createShare(
 			// Set password
 			if ($password !== '') {
 				$share->setPassword($password);
+				// Shares shared by email have temporary passwords by default
+				if ($shareType === IShare::TYPE_EMAIL) {
+					$this->setSharePasswordExpirationTime($share);
+				}
 			}
 
 			// Only share by mail have a recipient
@@ -1168,6 +1173,7 @@ public function updateShare(
 				$share->setPassword(null);
 			} elseif ($password !== null) {
 				$share->setPassword($password);
+				$this->setSharePasswordExpirationTime($share);
 			}
 
 			if ($label !== null) {
@@ -1504,6 +1510,34 @@ private function parseDate(string $expireDate): \DateTime {
 		return $date;
 	}
 
+	/**
+	 * Set the share's password expiration time
+	 *
+	 * @param IShare $share
+	 *
+	 */
+	private function setSharePasswordExpirationTime($share) {
+		if ($this->config->getSystemValue('allow_mail_share_permanent_password')) {
+			// Sets password expiration date to NULL
+			$share->setPasswordExpirationTime();
+		} else {
+			// Sets password expiration date
+			try {
+				$now = new \DateTime();
+				$expirationInterval = $this->config->getSystemValue('share_temporary_password_expiration_interval');
+				if ($expirationInterval === '') {
+					$expirationInterval = 'P0DT15M';
+				}
+				$expirationTime = $now->add(new \DateInterval($expirationInterval));
+			} catch (\Exception $e) {
+				// Catches invalid format for system value 'share_temporary_password_expiration_interval'
+				$expirationTime = $now->add(new \DateInterval('P0DT15M'));
+			} finally {
+				$share->setPasswordExpirationTime($expirationTime);
+			}
+		}
+	}
+
 	/**
 	 * Since we have multiple providers but the OCS Share API v1 does
 	 * not support this we need to check all backends.

apps/sharebymail/lib/ShareByMailProvider.php

@@ -753,43 +753,29 @@ public function update(IShare $share, $plainTextPassword = null) {
 			$this->sendPassword($share, $plainTextPassword);
 		}
 
-		// Gets password expiration interval. Defaults to 15 minutes.
-		$expirationInterval = $this->config->getSystemValue('share_temporary_password_expiration_interval');
-		if ($expirationInterval === '') {
-			$expirationInterval = 'P0DT15M';
-		}
-
 		/*
 		 * We allow updating the permissions and password of mail shares
 		 */
-		$now = new \DateTime();
-		try {
-			$expirationTime = $now->add(new \DateInterval($expirationInterval));
-		} catch (\Exception $e) {
-			// Catches invalid format for system value 'share_temporary_password_expiration_interval'
-			$expirationTime = $now->add(new \DateInterval('P0DT15M'));
-		} finally {
-			$qb = $this->dbConnection->getQueryBuilder();
-			$qb->update('share')
-				->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
-				->set('permissions', $qb->createNamedParameter($share->getPermissions()))
-				->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
-				->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
-				->set('password', $qb->createNamedParameter($share->getPassword()))
-				->set('password_expiration_time', $qb->createNamedParameter($expirationTime, IQueryBuilder::PARAM_DATE))
-				->set('label', $qb->createNamedParameter($share->getLabel()))
-				->set('password_by_talk', $qb->createNamedParameter($share->getSendPasswordByTalk(), IQueryBuilder::PARAM_BOOL))
-				->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE))
-				->set('note', $qb->createNamedParameter($share->getNote()))
-				->set('hide_download', $qb->createNamedParameter((int)$share->getHideDownload(), IQueryBuilder::PARAM_INT))
-				->executeStatement();
-
-			if ($originalShare->getNote() !== $share->getNote() && $share->getNote() !== '') {
-				$this->sendNote($share);
-			}
+		$qb = $this->dbConnection->getQueryBuilder();
+		$qb->update('share')
+			->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
+			->set('permissions', $qb->createNamedParameter($share->getPermissions()))
+			->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
+			->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
+			->set('password', $qb->createNamedParameter($share->getPassword()))
+			->set('password_expiration_time', $qb->createNamedParameter($share->getPasswordExpirationTime(), IQueryBuilder::PARAM_DATE))
+			->set('label', $qb->createNamedParameter($share->getLabel()))
+			->set('password_by_talk', $qb->createNamedParameter($share->getSendPasswordByTalk(), IQueryBuilder::PARAM_BOOL))
+			->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE))
+			->set('note', $qb->createNamedParameter($share->getNote()))
+			->set('hide_download', $qb->createNamedParameter((int)$share->getHideDownload(), IQueryBuilder::PARAM_INT))
+			->executeStatement();
 
-			return $share;
+		if ($originalShare->getNote() !== $share->getNote() && $share->getNote() !== '') {
+			$this->sendNote($share);
 		}
+
+		return $share;
 	}
 
 	/**

lib/private/Share20/Share.php

@@ -466,7 +466,7 @@ public function getPassword() {
 	/**
 	 * @inheritdoc
 	 */
-	public function setPasswordExpirationTime($passwordExpirationTime) {
+	public function setPasswordExpirationTime($passwordExpirationTime = null) {
 		$this->passwordExpirationTime = $passwordExpirationTime;
 		return $this;
 	}

lib/public/Share/IShare.php

@@ -453,7 +453,7 @@ public function getPassword();
 	 *
 	 * @return \OCP\Share\IShare The modified object
 	 */
-	public function setPasswordExpirationTime($passwordExpirationTime);
+	public function setPasswordExpirationTime($passwordExpirationTime = null);
 
 	/**
 	 * Get the password's expiration time of this share.