diff options
author | Vincent Petry <vincent@nextcloud.com> | 2022-06-13 10:26:07 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-13 10:26:07 +0200 |
commit | 7f8b032029e823373702ec37ae2599d46558126f (patch) | |
tree | d9ad05a775072de9b14e9b7e2f2f6ba44296ef76 | |
parent | 879a8c3b25387abb83924b9fa0f199ca6fa3d121 (diff) | |
parent | 6eb692da7fe73c899cb6a8d2aa045eddb1f14018 (diff) | |
download | nextcloud-server-7f8b032029e823373702ec37ae2599d46558126f.tar.gz nextcloud-server-7f8b032029e823373702ec37ae2599d46558126f.zip |
Merge pull request #32843 from nextcloud/bugfix/noid/correctly-log-failed-attempts
Correctly log failed attempts
-rw-r--r-- | apps/cloud_federation_api/lib/Controller/RequestHandlerController.php | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/apps/cloud_federation_api/lib/Controller/RequestHandlerController.php b/apps/cloud_federation_api/lib/Controller/RequestHandlerController.php index 53448119af3..ef77f2fa317 100644 --- a/apps/cloud_federation_api/lib/Controller/RequestHandlerController.php +++ b/apps/cloud_federation_api/lib/Controller/RequestHandlerController.php @@ -157,19 +157,23 @@ class RequestHandlerController extends Controller { $shareWith = $this->mapUid($shareWith); if (!$this->userManager->userExists($shareWith)) { - return new JSONResponse( + $response = new JSONResponse( ['message' => 'User "' . $shareWith . '" does not exists at ' . $this->urlGenerator->getBaseUrl()], Http::STATUS_BAD_REQUEST ); + $response->throttle(); + return $response; } } if ($shareType === 'group') { if (!$this->groupManager->groupExists($shareWith)) { - return new JSONResponse( + $response = new JSONResponse( ['message' => 'Group "' . $shareWith . '" does not exists at ' . $this->urlGenerator->getBaseUrl()], Http::STATUS_BAD_REQUEST ); + $response->throttle(); + return $response; } } @@ -253,10 +257,12 @@ class RequestHandlerController extends Controller { Http::STATUS_BAD_REQUEST ); } catch (ShareNotFound $e) { - return new JSONResponse( + $response = new JSONResponse( ['message' => $e->getMessage()], Http::STATUS_BAD_REQUEST ); + $response->throttle(); + return $response; } catch (ActionNotSupportedException $e) { return new JSONResponse( ['message' => $e->getMessage()], @@ -265,7 +271,9 @@ class RequestHandlerController extends Controller { } catch (BadRequestException $e) { return new JSONResponse($e->getReturnMessage(), Http::STATUS_BAD_REQUEST); } catch (AuthenticationFailedException $e) { - return new JSONResponse(["message" => "RESOURCE_NOT_FOUND"], Http::STATUS_FORBIDDEN); + $response = new JSONResponse(['message' => 'RESOURCE_NOT_FOUND'], Http::STATUS_FORBIDDEN); + $response->throttle(); + return $response; } catch (\Exception $e) { return new JSONResponse( ['message' => 'Internal error at ' . $this->urlGenerator->getBaseUrl()], |