diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2018-10-30 14:26:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-30 14:26:50 +0100 |
| commit | c1698948b8cf47924978578335a5a4e8c767682c (patch) | |
| tree | 261e582f9b52adc8b4a218b942696c42c97c4df9 /apps/oauth2/lib/Controller/OauthApiController.php | |
| parent | 8b2b238d86f9a1e1846328317f0c0b1cb6c86357 (diff) | |
| parent | 75456b057d58f321b6b46bd4f5899aba8e13fb02 (diff) | |
| download | nextcloud-server-c1698948b8cf47924978578335a5a4e8c767682c.tar.gz nextcloud-server-c1698948b8cf47924978578335a5a4e8c767682c.zip | |
Merge pull request #12130 from nextcloud/fix/reset_bruteforce_oauth
Reset bruteforce on token refresh OAuth
Diffstat (limited to 'apps/oauth2/lib/Controller/OauthApiController.php')
| -rw-r--r-- | apps/oauth2/lib/Controller/OauthApiController.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/apps/oauth2/lib/Controller/OauthApiController.php b/apps/oauth2/lib/Controller/OauthApiController.php index 2083741fa0c..978ca76d75b 100644 --- a/apps/oauth2/lib/Controller/OauthApiController.php +++ b/apps/oauth2/lib/Controller/OauthApiController.php @@ -24,6 +24,7 @@ namespace OCA\OAuth2\Controller; use OC\Authentication\Exceptions\InvalidTokenException; use OC\Authentication\Token\ExpiredTokenException; use OC\Authentication\Token\IProvider as TokenProvider; +use OC\Security\Bruteforce\Throttler; use OCA\OAuth2\Db\AccessTokenMapper; use OCA\OAuth2\Db\ClientMapper; use OCA\OAuth2\Exceptions\AccessTokenNotFoundException; @@ -49,6 +50,8 @@ class OauthApiController extends Controller { private $secureRandom; /** @var ITimeFactory */ private $time; + /** @var Throttler */ + private $throttler; /** * @param string $appName @@ -59,6 +62,7 @@ class OauthApiController extends Controller { * @param TokenProvider $tokenProvider * @param ISecureRandom $secureRandom * @param ITimeFactory $time + * @param Throttler $throttler */ public function __construct($appName, IRequest $request, @@ -67,7 +71,8 @@ class OauthApiController extends Controller { ClientMapper $clientMapper, TokenProvider $tokenProvider, ISecureRandom $secureRandom, - ITimeFactory $time) { + ITimeFactory $time, + Throttler $throttler) { parent::__construct($appName, $request); $this->crypto = $crypto; $this->accessTokenMapper = $accessTokenMapper; @@ -75,6 +80,7 @@ class OauthApiController extends Controller { $this->tokenProvider = $tokenProvider; $this->secureRandom = $secureRandom; $this->time = $time; + $this->throttler = $throttler; } /** @@ -164,6 +170,8 @@ class OauthApiController extends Controller { $accessToken->setEncryptedToken($this->crypto->encrypt($newToken, $newCode)); $this->accessTokenMapper->update($accessToken); + $this->throttler->resetDelay($this->request->getRemoteAddress(), 'login', ['user' => $appToken->getUID()]); + return new JSONResponse( [ 'access_token' => $newToken, |