Skip to content

[stable2.4] fix(slave-controller): add rate limit protection #202

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
cristianscheid merged 1 commit into from
Jun 16, 2026
Merged

[stable2.4] fix(slave-controller): add rate limit protection #202

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
39 changes: 19 additions & 20 deletions lib/Controller/SlaveController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,7 @@ public function __construct(
* @PublicPage
* @NoCSRFRequired
* @UseSession
*
* @param string $jwt
*
* @return RedirectResponse
* @BruteForceProtection(action=autoLogin)
*/
public function autoLogin(string $jwt): RedirectResponse {
$this->logger->debug('autologin incoming request with ' . $jwt);
Expand All @@ -115,11 +112,10 @@ public function autoLogin(string $jwt): RedirectResponse {
return new RedirectResponse('');
}

if ($this->gss->isMaster()) {
return new RedirectResponse($masterUrl);
}
if ($jwt === '') {
return new RedirectResponse($masterUrl);
if ($this->gss->isMaster() || $jwt === '') {
$response = new RedirectResponse($masterUrl);
$response->throttle();
return $response;
}

try {
Expand Down Expand Up @@ -158,12 +154,14 @@ public function autoLogin(string $jwt): RedirectResponse {
}
} catch (ExpiredException $e) {
$this->logger->info('token expired');

return new RedirectResponse($masterUrl);
$response = new RedirectResponse($masterUrl);
$response->throttle();
return $response;
} catch (\Exception $e) {
$this->logger->warning('issue during login process', ['exception' => $e]);

return new RedirectResponse($masterUrl);
$response = new RedirectResponse($masterUrl);
$response->throttle();
return $response;
}

$this->logger->debug('all good. creating session');
Expand All @@ -179,16 +177,15 @@ public function autoLogin(string $jwt): RedirectResponse {
}

/**
* Create app token
*
* @PublicPage
* @NoAdminRequired
*
* @return DataResponse
* @BruteForceProtection(action=createAppToken)
*/
public function createAppToken($jwt) {
public function createAppToken($jwt): DataResponse {
if ($this->gss->getMode() === 'master' || empty($jwt)) {
return new DataResponse([], Http::STATUS_BAD_REQUEST);
$response = new DataResponse([], Http::STATUS_BAD_REQUEST);
$response->throttle();
return $response;
}

try {
Expand All @@ -213,7 +210,9 @@ public function createAppToken($jwt) {
$this->logger->info('issue while token creation', ['exception' => $e]);
}

return new DataResponse([], Http::STATUS_BAD_REQUEST);
$response = new DataResponse([], Http::STATUS_BAD_REQUEST);
$response->throttle();
return $response;
}

/**
Expand Down
Loading