Skip to content

[stable24] Locking #2219

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
juliusknorr merged 3 commits into from
May 17, 2022
Merged

[stable24] Locking #2219

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f5b926
Implement support for files_lock app
juliusknorr Mar 15, 2022
d9ec7c7
Only lint supported php versions
juliusknorr May 16, 2022
f67b5f7
Adapt token exception to 24
juliusknorr May 17, 2022
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
Adapt token exception to 24 
Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr
juliusknorr committed May 17, 2022
commit f67b5f711f4eb7e30a27aeee431f16935fcf74c3
5 changes: 1 addition & 4 deletions lib/Controller/WopiController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,12 +570,9 @@ public function postFile(string $fileId, string $access_token): JSONResponse {
$wopiLock = $this->request->getHeader('X-WOPI-Lock');
list($fileId, ,) = Helper::parseFileId($fileId);
$wopi = $this->wopiMapper->getWopiForToken($access_token);
} catch (UnknownTokenException $e) {
} catch (DoesNotExistException $e) {
$this->logger->debug($e->getMessage(), ['app' => 'richdocuments']);
return new JSONResponse([], Http::STATUS_FORBIDDEN);
} catch (ExpiredTokenException $e) {
$this->logger->debug($e->getMessage(), ['app' => 'richdocuments']);
return new JSONResponse([], Http::STATUS_UNAUTHORIZED);
} catch (\Exception $e) {
$this->logger->logException($e, ['app' => 'richdocuments']);
return new JSONResponse([], Http::STATUS_FORBIDDEN);
Expand Down