Skip to content

Add status code 429 for too many requests on ocs API requests #43611

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

Closed
akhil1508 wants to merge 1 commit into from
Closed

Add status code 429 for too many requests on ocs API requests #43611

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Add status code 429 for too many requests on ocs API requests 
Signed-off-by: Akhil <[email protected]>
  • Loading branch information
@akhil1508
akhil1508 committed Feb 16, 2024
commit 50f453ed931a2a360ee4ebdd1dce8be96a3c1650
3 changes: 3 additions & 0 deletions ocs/v1.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@
OC_API::respond($ex->getResult(), OC_API::requestedFormat());
} catch (\OC\User\LoginException $e) {
OC_API::respond(new \OC\OCS\Result(null, \OCP\AppFramework\OCSController::RESPOND_UNAUTHORISED, 'Unauthorised'));
} catch (\OCP\Security\Bruteforce\MaxDelayReached) {
Copy link
Member

@joshtrichards joshtrichards Feb 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't already handled a few lines up (line 67 in this code block) due to recent #41937? Or do I need to finish drinking my morning coffee? :)

@akhil1508 Did you by chance see this in a slightly outdated environment in the wild (latest v26, v27, and v28 should all handle this already)?

Copy link
Contributor Author

@akhil1508 akhil1508 Feb 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you by chance see this in a slightly outdated environment in the wild (latest v26, v27, and v28 should all handle this already)?

Ahhh yes, my bad. Apologies!

OC_API::setContentType();
http_response_code(429);
} catch (\Exception $e) {
\OCP\Server::get(LoggerInterface::class)->error($e->getMessage(), ['exception' => $e]);
OC_API::setContentType();
Expand Down