Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1613 from ArthurHoaro/hotfix/404-not-authorized

Browse source 
Raise 404 error instead of 500 if permalink access is denied
This commit is contained in:
ArthurHoaro 2020-10-28 13:22:40 +01:00 committed by GitHub
commit d2bb40cc7c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
application/bookmark/BookmarkFileService.php
View file

@ -106,7 +106,7 @@ public function findByHash(string $hash, string $privateKey = null): Bookmark
&& $first->isPrivate() && $first->isPrivate()
&& (empty($privateKey) || $privateKey !== $first->getAdditionalContentEntry('private_key')) && (empty($privateKey) || $privateKey !== $first->getAdditionalContentEntry('private_key'))
) { ) {
throw new Exception('Not authorized'); throw new BookmarkNotFoundException();
} }
return $first; return $first;

4
tests/bookmark/BookmarkFileServiceTest.php
View file

@ -886,8 +886,8 @@ public function testFilterHashInValid()
*/ */
public function testFilterHashPrivateWhileLoggedOut() public function testFilterHashPrivateWhileLoggedOut()
{ {
$this->expectException(\Exception::class); $this->expectException(BookmarkNotFoundException::class);
$this->expectExceptionMessage('Not authorized'); $this->expectExceptionMessage('The link you are trying to reach does not exist or has been deleted');
$hash = smallHash('20141125_084734' . 6); $hash = smallHash('20141125_084734' . 6);