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

Fix unknown share token

Browse source 
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2017-06-13 18:44:14 +02:00
parent 72ccab0ab6
commit 0f8c1b13a3
No known key found for this signature in database
GPG key ID: E166FD8976B3BAC8
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/private/Share20/Manager.php
View file

@ -1090,7 +1090,7 @@ class Manager implements IManager {
}
if ($share === null) {
throw new ShareNotFound();
throw new ShareNotFound($this->l->t('The requested share does not exist anymore'));
}
$this->checkExpireDate($share);
@ -1110,7 +1110,7 @@ class Manager implements IManager {
if ($share->getExpirationDate() !== null &&
$share->getExpirationDate() <= new \DateTime()) {
$this->deleteShare($share);
throw new ShareNotFound();
throw new ShareNotFound($this->l->t('The requested share does not exist anymore'));
}
}

5
tests/lib/Share20/ManagerTest.php
View file

@ -2142,6 +2142,7 @@ class ManagerTest extends \Test\TestCase {
/**
* @expectedException \OCP\Share\Exceptions\ShareNotFound
* @expectedExceptionMessage The requested share does not exist anymore
*/
public function testGetShareByTokenExpired() {
$this->config
@ -2150,6 +2151,10 @@ class ManagerTest extends \Test\TestCase {
->with('core', 'shareapi_allow_links', 'yes')
->willReturn('yes');
$this->l->expects($this->once())
->method('t')
->willReturnArgument(0);
$manager = $this->createManagerMock()
->setMethods(['deleteShare'])
->getMock();