Skip to content

[stable25] Require token for local editing #34564

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
blizzz merged 6 commits into from
Oct 13, 2022
Merged

[stable25] Require token for local editing #34564

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1d02efd
Require a token for "Edit locally"
nickvergessen Oct 11, 2022
1db6d96
Also remove token when we successfully validated
nickvergessen Oct 11, 2022
ec230f9
Add a background job to delete expired tokens
nickvergessen Oct 12, 2022
c48b15f
Fix psalm error on migration
nickvergessen Oct 12, 2022
be00587
Also throttle on expiration
nickvergessen Oct 12, 2022
7da8714
Bump version
nickvergessen Oct 13, 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
Next Next commit
Also throttle on expiration 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen @backportbot-nextcloud
nickvergessen authored and backportbot-nextcloud[bot] committed Oct 12, 2022
commit be005877ff8b3e9d2d0496d4a86b08589ea45155
4 changes: 3 additions & 1 deletion apps/files/lib/Controller/OpenLocalEditorController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,9 @@ public function validate(string $path, string $token): DataResponse {
$this->mapper->delete($entity);

if ($entity->getExpirationTime() <= $this->timeFactory->getTime()) {
return new DataResponse([], Http::STATUS_NOT_FOUND);
$response = new DataResponse([], Http::STATUS_NOT_FOUND);
$response->throttle(['userId' => $this->userId, 'pathHash' => $pathHash]);
return $response;
}

return new DataResponse([
Expand Down