Skip to content

[stable18] Fix default internal expiration date #24161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 16 commits into from
Nov 16, 2020
Merged

[stable18] Fix default internal expiration date #24161

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
1d0a70e
Use the shorter phpunit syntax for mocked return values in ManagerTest
ChristophWurst Mar 25, 2020
f592384
Fix typos in method names
danxuliu Nov 11, 2020
e9dfa13
Fix typo in variable name
danxuliu Nov 11, 2020
66eb123
Remove extra spaces
danxuliu Nov 12, 2020
4789709
Remove wrong and misleading comment
danxuliu Nov 11, 2020
aaeaed0
Add unit tests to enforce a relaxed default share expiration date
danxuliu Nov 11, 2020
f4f39fc
Fix unit test for verifying enforced expire date too far in the future
danxuliu Nov 11, 2020
eae5fa8
Fix unit test for verifying enforced valid expiration date.
danxuliu Nov 12, 2020
6cf3c29
Fix unit test method name
danxuliu Nov 12, 2020
2f8f06f
Fix unit test for expiration date without date but with default
danxuliu Nov 12, 2020
c138d2d
Add unit test for expiration date with date and with default
danxuliu Nov 12, 2020
713e879
Add explicit time to test date for clarity
danxuliu Nov 12, 2020
bae712b
Fix default internal expiration date
danxuliu Nov 12, 2020
68f67d9
Add unit tests for "validateExpirationDateInternal"
danxuliu Nov 12, 2020
aadd0ab
Reset app configs by deleting the values instead of setting the defaults
danxuliu Nov 12, 2020
47ca9e3
Add integration tests for creating shares with default expiration dates
danxuliu Nov 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix default internal expiration date 
The default expiration date for internal shares was set from the default
link expiration date instead of the internal one.

Signed-off-by: Daniel Calviño Sánchez <[email protected]>
  • Loading branch information
@danxuliu
danxuliu committed Nov 16, 2020
commit bae712b68eab59a8e05867f36aa1b5dc4bcbc126
6 changes: 3 additions & 3 deletions lib/private/Share20/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,9 +402,9 @@ protected function validateExpirationDateInternal(\OCP\Share\IShare $share) {
$expirationDate = new \DateTime();
$expirationDate->setTime(0,0,0);

$days = (int)$this->config->getAppValue('core', 'internal_defaultExpDays', $this->shareApiLinkDefaultExpireDays());
if ($days > $this->shareApiLinkDefaultExpireDays()) {
$days = $this->shareApiLinkDefaultExpireDays();
$days = (int)$this->config->getAppValue('core', 'internal_defaultExpDays', (string)$this->shareApiInternalDefaultExpireDays());
if ($days > $this->shareApiInternalDefaultExpireDays()) {
$days = $this->shareApiInternalDefaultExpireDays();
}
$expirationDate->add(new \DateInterval('P'.$days.'D'));
}
Expand Down