[stable28] Respect empty `expiryDate` value in server #45482

backportbot · 2024-05-23T14:42:58Z

Backport of #44485

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

Review and resolve any conflicts
Amend HEAD commit to remove the line stating to skip CI

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

lib/private/Share20/Share.php

+	 * @inheritdoc
+	 */
+	public function setNoExpirationDate(bool $noExpirationDate) {
+		$this->noExpirationDate = $noExpirationDate;


lib/private/Share20/Share.php

+	 * @inheritdoc
+	 */
+	public function getNoExpirationDate(): bool {
+		return $this->noExpirationDate;


apps/files_sharing/lib/Controller/ShareAPIController.php

@@ -586,7 +586,8 @@
 	 * @param string $publicUpload If public uploading is allowed
 	 * @param string $password Password for the share
 	 * @param string|null $sendPasswordByTalk Send the password for the share over Talk
-	 * @param string $expireDate Expiry date of the share using user timezone at 00:00. It means date in UTC timezone will be used.
+	 * @param ?string $expireDate The expiry date of the share in the user's timezone (UTC) at 00:00.


lib/private/Share20/Manager.php

-		$this->knownUserService = $knownUserService;
-		$this->shareDisableChecker = $shareDisableChecker;
-		$this->dateTimeZone = $dateTimeZone;
+		$this->legacyHooks = new LegacyHooks($this->dispatcher);


lib/private/Share20/Manager.php

+		// Then skip expiration date validation as null is accepted
+		if(!($share->getNoExpirationDate() && !$isEnforced)) {
+			if ($expirationDate != null) {
+				$expirationDate->setTimezone($this->dateTimeZone->getTimeZone());


lib/private/Share20/Manager.php

+					throw new \InvalidArgumentException('Expiration date is enforced');
+				}
+
+				$date = new \DateTime('now', $this->dateTimeZone->getTimeZone());


lib/private/Share20/Manager.php

+		// Then skip expiration date validation as null is accepted
+		if(!($share->getNoExpirationDate() && !$isEnforced)) {
+			if ($expirationDate !== null) {
+				$expirationDate->setTimezone($this->dateTimeZone->getTimeZone());


lib/private/Share20/Manager.php

+			}
+
+			if ($fullId === null && $expirationDate === null && $this->shareApiLinkDefaultExpireDate()) {
+				$expirationDate = new \DateTime('now', $this->dateTimeZone->getTimeZone());


lib/private/Share20/Manager.php

+				$expirationDate = new \DateTime('now', $this->dateTimeZone->getTimeZone());
+				$expirationDate->setTime(0, 0, 0);
+
+				$days = (int)$this->config->getAppValue('core', 'link_defaultExpDays', (string)$this->shareApiLinkDefaultExpireDays());


lib/private/Share20/Manager.php

+					throw new \InvalidArgumentException('Expiration date is enforced');
+				}
+
+				$date = new \DateTime('now', $this->dateTimeZone->getTimeZone());


apps/files_sharing/lib/Controller/ShareAPIController.php

If `expireDate` is an empty string and not `null` then the server should not set a default. Signed-off-by: fenn-cs <fenn25.fn@gmail.com>

Signed-off-by: fenn-cs <fenn25.fn@gmail.com>

- Verify that explicitly sending empty `expireDate` param to server overwrite default and sets not expiry date, if non is enforced. - Update tests to avoid converting empty string to date. Signed-off-by: fenn-cs <fenn25.fn@gmail.com>

Antreesy · 2024-05-31T12:15:20Z

apps/files_sharing/lib/Controller/ShareAPIController.php

@@ -586,7 +586,8 @@ public function deleteShare(string $id): DataResponse {
 	 * @param string $publicUpload If public uploading is allowed
 	 * @param string $password Password for the share
 	 * @param string|null $sendPasswordByTalk Send the password for the share over Talk
-	 * @param string $expireDate Expiry date of the share using user timezone at 00:00. It means date in UTC timezone will be used.
+	 * @param ?string $expireDate The expiry date of the share in the user's timezone (UTC) at 00:00.


L612 missing?

?string $expireDate = null,

And L793?

if ($expireDate !== null) { if ($expireDate !== '') {

Antreesy · 2024-05-31T12:20:35Z

lib/private/Share20/Manager.php

-	private IDateTimeZone $dateTimeZone;
+
+	private IL10N|null $l;
+	private LegacyHooks $legacyHooks;

 	public function __construct(
 		LoggerInterface $logger,


Suggested change

LoggerInterface $logger,

private LoggerInterface $logger,

and further?

Antreesy · 2024-05-31T12:22:37Z

lib/private/Share20/Share.php

@@ -99,7 +99,6 @@ class Share implements IShare {

 	/** @var ICacheEntry|null */
 	private $nodeCacheEntry;
-
 	/** @var bool */
 	private $hideDownload = false;



Suggested change

private bool $noExpirationDate = false;

nfebe · 2024-05-31T13:09:42Z

Closing in favor of #45604

stable29 had similar backport issues, fixed there and backported via stable29

backportbot bot requested review from artonge and nfebe May 23, 2024 14:42

backportbot bot added 3. to review Waiting for reviews feature: sharing 27-feedback 28-feedback feedback-requested labels May 23, 2024

backportbot bot added this to the Nextcloud 28.0.6 milestone May 23, 2024

backportbot bot assigned nfebe May 23, 2024

nfebe marked this pull request as ready for review May 23, 2024 15:27

nfebe requested a review from provokateurin as a code owner May 23, 2024 15:28

nfebe enabled auto-merge May 23, 2024 15:28

nfebe approved these changes May 23, 2024

View reviewed changes

github-advanced-security bot found potential problems May 23, 2024

View reviewed changes

AndyScherzinger force-pushed the backport/44485/stable28 branch from bcd8482 to a81833a Compare May 27, 2024 10:05

AndyScherzinger modified the milestones: Nextcloud 28.0.6, Nextcloud 28.0.7 May 28, 2024

Antreesy reviewed May 31, 2024

View reviewed changes

apps/files_sharing/lib/Controller/ShareAPIController.php Show resolved Hide resolved

nfebe added 2 commits May 31, 2024 11:15

fix(shareManager): Respect empty expireDate in server

89e8d3e

If `expireDate` is an empty string and not `null` then the server should not set a default. Signed-off-by: fenn-cs <fenn25.fn@gmail.com>

refactor(shareManager): Use constructor property promotion

3856111

Signed-off-by: fenn-cs <fenn25.fn@gmail.com>

nfebe force-pushed the backport/44485/stable28 branch from a81833a to 88b84b8 Compare May 31, 2024 10:16

nfebe requested a review from Antreesy May 31, 2024 10:16

nfebe force-pushed the backport/44485/stable28 branch from 88b84b8 to 4a583bc Compare May 31, 2024 10:17

Antreesy reviewed May 31, 2024

View reviewed changes

nfebe closed this May 31, 2024

auto-merge was automatically disabled May 31, 2024 13:09
Pull request was closed

solracsf deleted the backport/44485/stable28 branch June 1, 2024 08:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[stable28] Respect empty `expiryDate` value in server #45482

[stable28] Respect empty `expiryDate` value in server #45482

backportbot bot commented May 23, 2024 •

edited by nfebe

Loading

Antreesy May 31, 2024

Antreesy May 31, 2024

Antreesy May 31, 2024

nfebe commented May 31, 2024

[stable28] Respect empty expiryDate value in server #45482

[stable28] Respect empty expiryDate value in server #45482

Conversation

backportbot bot commented May 23, 2024 • edited by nfebe Loading

Todo

Antreesy May 31, 2024

Choose a reason for hiding this comment

Antreesy May 31, 2024

Choose a reason for hiding this comment

Antreesy May 31, 2024

Choose a reason for hiding this comment

nfebe commented May 31, 2024

[stable28] Respect empty `expiryDate` value in server #45482

[stable28] Respect empty `expiryDate` value in server #45482

backportbot bot commented May 23, 2024 •

edited by nfebe

Loading