Browse Source
Fix unknown share token
Signed-off-by: Joas Schilling <coding@schilljs.com>
pull/5367/head
Joas Schilling
9 years ago
No known key found for this signature in database
GPG Key ID: E166FD8976B3BAC8
2 changed files with
7 additions and
2 deletions
-
lib/private/Share20/Manager.php
-
tests/lib/Share20/ManagerTest.php
|
|
|
@ -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')); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
@ -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(); |
|
|
|
|