diff options
author | blizzz <blizzz@arthur-schiwon.de> | 2022-06-13 13:45:49 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-13 13:45:49 +0300 |
commit | 2c06c3eee9c52f9eb9aa93f574539343d20747d0 (patch) | |
tree | a6c1aba3c2bcd0bc576b2bfe3819364b0cbc76d2 | |
parent | c46a8d8f86190a8ab25fc4bbe829b2015fea586a (diff) | |
parent | fa2d3ede52198e7ba0db0dcfb6599714288d0898 (diff) |
Merge pull request #32856 from nextcloud/backport/32843/stable22
[stable22] 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 02105fb3f9c..4c16c565d62 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; } } @@ -252,10 +256,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()], @@ -264,7 +270,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()], |