wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #19297 from owncloud/fix_19119

Browse source 
Do not blindy copy expiration date on reshare
This commit is contained in:
Thomas Müller 2015-09-25 14:36:07 +02:00
commit 8f2a14c5d6
2 changed files with 37 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/private/share/share.php
View file

@ -1998,7 +1998,6 @@ class Share extends Constants {
$suggestedItemTarget = $result['suggestedItemTarget'];
$suggestedFileTarget = $result['suggestedFileTarget'];
$filePath = $result['filePath'];
$expirationDate = $result['expirationDate'];
}
$isGroupShare = false;

37
tests/lib/share/share.php
View file

@ -1567,6 +1567,43 @@ class Test_Share extends \Test\TestCase {
$this->setHttpHelper($oldHttpHelper);
}
/**
* Test case for #19119
*/
public function testReshareWithLinkDefaultExpirationDate() {
$config = \OC::$server->getConfig();
$config->setAppValue('core', 'shareapi_default_expire_date', 'yes');
$config->setAppValue('core', 'shareapi_expire_after_n_days', '2');
// Expiration date
$expireAt = time() + 2 * 24*60*60;
$date = new DateTime();
$date->setTimestamp($expireAt);
$date->setTime(0, 0, 0);
//Share a file from user 1 to user 2
$this->shareUserTestFileWithUser($this->user1, $this->user2);
//User 2 shares as link
OC_User::setUserId($this->user2);
$result = OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_LINK, null, \OCP\Constants::PERMISSION_READ);
$this->assertTrue(is_string($result));
//Check if expire date is correct
$result = OCP\Share::getItemShared('test', 'test.txt');
$this->assertCount(1, $result);
$result = reset($result);
$this->assertNotEmpty($result['expiration']);
$expireDate = new DateTime($result['expiration']);
$this->assertEquals($date, $expireDate);
//Unshare
$this->assertTrue(OCP\Share::unshareAll('test', 'test.txt'));
//Reset config
$config->deleteAppValue('core', 'shareapi_default_expire_date');
$config->deleteAppValue('core', 'shareapi_expire_after_n_days');
}
}
class DummyShareClass extends \OC\Share\Share {