Skip to content

[stable28] fix(ApiService): Catch NotPermittedException and return 404 #6022

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
mejo- merged 2 commits into from
Jul 9, 2024
Merged

[stable28] fix(ApiService): Catch NotPermittedException and return 404 #6022

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b27f9d5
chore(ApiService): Use constants for http status codes everywhere
mejo- Jul 9, 2024
c952501
fix(ApiService): Catch NotPermittedException and return 404
mejo- Jul 9, 2024
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
Prev Previous commit
fix(ApiService): Catch NotPermittedException and return 404 
Also adjust 404 error message in create api function in case of
NotPermittedException. We don't want to distinguish between missing
permissions and nonexisting files to not reveal that the file exists.

Signed-off-by: Jonas <[email protected]>
  • Loading branch information
@mejo- @backportbot
mejo- authored and backportbot[bot] committed Jul 9, 2024
commit c952501767f3f701fb8e65f428286b072381a27f
8 changes: 5 additions & 3 deletions lib/Service/ApiService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,9 @@ public function create(?int $fileId = null, ?string $filePath = null, ?string $b
$file = $this->documentService->getFileById($fileId);
} catch (NotFoundException|NotPermittedException $e) {
$this->logger->error('No permission to access this file', [ 'exception' => $e ]);
return new DataResponse(['error' => $this->l10n->t('No permission to access this file.')], Http::STATUS_NOT_FOUND);
return new DataResponse([
'error' => $this->l10n->t('File not found')
], Http::STATUS_NOT_FOUND);
}
} else {
return new DataResponse(['error' => 'No valid file argument provided'], Http::STATUS_PRECONDITION_FAILED);
Expand Down Expand Up @@ -228,7 +230,7 @@ public function sync(Session $session, Document $document, int $version = 0, ?st
// ensure file is still present and accessible
$file = $this->documentService->getFileForSession($session, $shareToken);
$this->documentService->assertNoOutsideConflict($document, $file);
} catch (NotFoundException|InvalidPathException $e) {
} catch (NotPermittedException|NotFoundException|InvalidPathException $e) {
$this->logger->info($e->getMessage(), ['exception' => $e]);
return new DataResponse([
'message' => 'File not found'
Expand All @@ -253,7 +255,7 @@ public function sync(Session $session, Document $document, int $version = 0, ?st
public function save(Session $session, Document $document, int $version = 0, ?string $autosaveContent = null, ?string $documentState = null, bool $force = false, bool $manualSave = false, ?string $shareToken = null): DataResponse {
try {
$file = $this->documentService->getFileForSession($session, $shareToken);
} catch (NotFoundException $e) {
} catch (NotPermittedException|NotFoundException $e) {
$this->logger->info($e->getMessage(), ['exception' => $e]);
return new DataResponse([
'message' => 'File not found'
Expand Down