Skip to content

Set default expiration date if none given on share creation #22646

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
DeepDiver1975 merged 1 commit into from
Feb 26, 2016
Merged

Set default expiration date if none given on share creation #22646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 16 additions & 16 deletions lib/private/share20/manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ protected function generalCreateChecks(\OCP\Share\IShare $share) {
* Validate if the expiration date fits the system settings
*
* @param \OCP\Share\IShare $share The share to validate the expiration date of
* @return \OCP\Share\IShare The expiration date or null if $expireDate was null and it is not required
* @return \OCP\Share\IShare The modified share object
* @throws GenericShareException
* @throws \InvalidArgumentException
* @throws \Exception
Expand All @@ -245,6 +245,20 @@ protected function validateExpirationDate(\OCP\Share\IShare $share) {
}
}

// If expiredate is empty set a default one if there is a default
$fullId = null;
try {
$fullId = $share->getFullId();
} catch (\UnexpectedValueException $e) {
// This is a new share
}

if ($fullId === null && $expirationDate === null && $this->shareApiLinkDefaultExpireDate()) {
$expirationDate = new \DateTime();
$expirationDate->setTime(0,0,0);
$expirationDate->add(new \DateInterval('P'.$this->shareApiLinkDefaultExpireDays().'D'));
}

// If we enforce the expiration date check that is does not exceed
if ($this->shareApiLinkDefaultExpireDateEnforced()) {
if ($expirationDate === null) {
Expand All @@ -260,20 +274,6 @@ protected function validateExpirationDate(\OCP\Share\IShare $share) {
}
}

// If expiredate is empty set a default one if there is a default
$fullId = null;
try {
$fullId = $share->getFullId();
} catch (\UnexpectedValueException $e) {
// This is a new share
}

if ($fullId === null && $expirationDate === null && $this->shareApiLinkDefaultExpireDate()) {
$expirationDate = new \DateTime();
$expirationDate->setTime(0,0,0);
$expirationDate->add(new \DateInterval('P'.$this->shareApiLinkDefaultExpireDays().'D'));
}

$accepted = true;
$message = '';
\OCP\Util::emitHook('\OC\Share', 'verifyExpirationDate', [
Expand All @@ -289,7 +289,7 @@ protected function validateExpirationDate(\OCP\Share\IShare $share) {

$share->setExpirationDate($expirationDate);

return $expirationDate;
return $share;
}

/**
Expand Down
33 changes: 27 additions & 6 deletions tests/lib/share20/managertest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,6 +713,7 @@ public function testvalidateExpirationDateInPast() {
*/
public function testvalidateExpirationDateEnforceButNotSet() {
$share = $this->manager->newShare();
$share->setProviderId('foo')->setId('bar');

$this->config->method('getAppValue')
->will($this->returnValueMap([
Expand All @@ -722,6 +723,26 @@ public function testvalidateExpirationDateEnforceButNotSet() {
$this->invokePrivate($this->manager, 'validateExpirationDate', [$share]);
}

public function testvalidateExpirationDateEnforceButNotSetNewShare() {
$share = $this->manager->newShare();

$this->config->method('getAppValue')
->will($this->returnValueMap([
['core', 'shareapi_enforce_expire_date', 'no', 'yes'],
['core', 'shareapi_expire_after_n_days', '7', '3'],
['core', 'shareapi_default_expire_date', 'no', 'yes'],
]));

$expected = new \DateTime();
$expected->setTime(0,0,0);
$expected->add(new \DateInterval('P3D'));

$this->invokePrivate($this->manager, 'validateExpirationDate', [$share]);

$this->assertNotNull($share->getExpirationDate());
$this->assertEquals($expected, $share->getExpirationDate());
}

public function testvalidateExpirationDateEnforceToFarIntoFuture() {
// Expire date in the past
$future = new \DateTime();
Expand Down Expand Up @@ -769,9 +790,9 @@ public function testvalidateExpirationDateEnforceValid() {
return $data['expirationDate'] == $future;
}));

$future = $this->invokePrivate($this->manager, 'validateExpirationDate', [$share]);
$this->invokePrivate($this->manager, 'validateExpirationDate', [$share]);

$this->assertEquals($expected, $future);
$this->assertEquals($expected, $share->getExpirationDate());
}

public function testvalidateExpirationDateNoDateNoDefaultNull() {
Expand All @@ -790,9 +811,9 @@ public function testvalidateExpirationDateNoDateNoDefaultNull() {
return $data['expirationDate'] == $expected;
}));

$res = $this->invokePrivate($this->manager, 'validateExpirationDate', [$share]);
$this->invokePrivate($this->manager, 'validateExpirationDate', [$share]);

$this->assertEquals($expected, $res);
$this->assertEquals($expected, $share->getExpirationDate());
}

public function testvalidateExpirationDateNoDateNoDefault() {
Expand All @@ -804,9 +825,9 @@ public function testvalidateExpirationDateNoDateNoDefault() {

$share = $this->manager->newShare();

$date = $this->invokePrivate($this->manager, 'validateExpirationDate', [$share]);
$this->invokePrivate($this->manager, 'validateExpirationDate', [$share]);

$this->assertNull($date);
$this->assertNull($share->getExpirationDate());
}

public function testvalidateExpirationDateNoDateDefault() {
Expand Down