[stable27] Respect empty expiryDate value in server - #45481
Merged
Conversation
backportbot
Bot
added
3. to review
artonge
marked this pull request as ready for review
May 23, 2024 14:54
![github-advanced-security[bot]](https://cdn.github.com/in/57789?s=60&v=4){kind=small}
artonge
force-pushed
the
backport/44485/stable27
branch
from
May 23, 2024 15:02
16961d3 to
78f6480
Compare
artonge
force-pushed
the
backport/44485/stable27
branch
2 times, most recently
from
May 23, 2024 16:11
97d6fa4 to
b843a09
Compare
nfebe
reviewed
May 23, 2024
nfebe
force-pushed
the
backport/44485/stable27
branch
2 times, most recently
from
May 23, 2024 16:45
2758e55 to
5e299a1
Compare
nfebe
approved these changes
May 23, 2024
nfebe
enabled auto-merge
May 23, 2024 16:48
artonge
force-pushed
the
backport/44485/stable27
branch
2 times, most recently
from
May 24, 2024 07:53
0eca300 to
f4cc01e
Compare
skjnldsv
disabled auto-merge
May 24, 2024 11:36
skjnldsv
force-pushed
the
backport/44485/stable27
branch
2 times, most recently
from
May 24, 2024 11:39
6619684 to
6e82249
Compare
Member
nfebe
force-pushed
the
backport/44485/stable27
branch
2 times, most recently
from
May 24, 2024 14:08
48dc40e to
efa128b
Compare
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>
nfebe
force-pushed
the
backport/44485/stable27
branch
from
May 24, 2024 14:31
efa128b to
03889c8
Compare
- 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>
nfebe
force-pushed
the
backport/44485/stable27
branch
from
May 25, 2024 10:19
03889c8 to
bdeba65
Compare
4 tasks
Comment on lines
+659
to
+660
| $expireDate = $this->parseDate($expireDate); | ||
| $share->setExpirationDate($expireDate); |
Member
There was a problem hiding this comment.
This is different on master and actually causes a bug in 27...
https://github.com/nextcloud/server/pull/44485/files#diff-dbbe017dd357504abc442a6f1d0305166520ebf80353f42814b3f879a3e241bcR653-R654
OCA\Talk\Share\Helper\ShareAPIController::createShare(): Argument #4 ($expireDate) must be of type string, DateTime given, called in /apps/files_sharing/lib/Controller/ShareAPIController.php on line 786
Seems it was dropped on a rebase or when redoing the PR
Contributor
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport of #44485
Warning, This backport's changes differ from the original and might be incomplete⚠️
Todo
Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.