Skip to content

[stable22] fix(dav): Abort requests with 429 instead of waiting #39256

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
nickvergessen merged 3 commits into from
Jul 10, 2023
Merged

[stable22] fix(dav): Abort requests with 429 instead of waiting #39256

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ca2973
chore: use local variable for remote address
kesselb Feb 21, 2023
43532a4
chore(tests): add tests for handleLoginFailed
kesselb Feb 21, 2023
da708a5
fix(dav): Abort requests with 429 instead of waiting
nickvergessen Mar 30, 2023
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
Next Next commit
chore: use local variable for remote address 
Signed-off-by: Daniel Kesselberg <[email protected]>
  • Loading branch information
@kesselb @nickvergessen
kesselb authored and nickvergessen committed Jul 10, 2023
commit 6ca2973b175b6a473e51971d1daee9580e11c28b
37 changes: 23 additions & 14 deletions lib/private/User/Session.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
use OC\Authentication\Token\IToken;
use OC\Hooks\Emitter;
use OC\Hooks\PublicEmitter;
use OC\Security\Bruteforce\Throttler;
use OC_User;
use OC_Util;
use OCA\DAV\Connector\Sabre\Auth;
Expand Down Expand Up @@ -428,16 +429,17 @@ public function completeLogin(IUser $user, array $loginDetails, $regenerateSessi
* @param string $user
* @param string $password
* @param IRequest $request
* @param OC\Security\Bruteforce\Throttler $throttler
* @param Throttler $throttler
* @throws LoginException
* @throws PasswordLoginForbiddenException
* @return boolean
*/
public function logClientIn($user,
$password,
IRequest $request,
OC\Security\Bruteforce\Throttler $throttler) {
$currentDelay = $throttler->sleepDelay($request->getRemoteAddress(), 'login');
Throttler $throttler) {
$remoteAddress = $request->getRemoteAddress();
$currentDelay = $throttler->sleepDelay($remoteAddress, 'login');

if ($this->manager instanceof PublicEmitter) {
$this->manager->emit('\OC\User', 'preLogin', [$user, $password]);
Expand All @@ -461,17 +463,13 @@ public function logClientIn($user,
if (!$this->login($user, $password)) {

// Failed, maybe the user used their email address
if (!filter_var($user, FILTER_VALIDATE_EMAIL)) {
$this->handleLoginFailed($throttler, $currentDelay, $remoteAddress, $user, $password);
return false;
}
$users = $this->manager->getByEmail($user);
if (!(\count($users) === 1 && $this->login($users[0]->getUID(), $password))) {
$this->logger->warning('Login failed: \'' . $user . '\' (Remote IP: \'' . \OC::$server->getRequest()->getRemoteAddress() . '\')', ['app' => 'core']);

$throttler->registerAttempt('login', $request->getRemoteAddress(), ['user' => $user]);

$this->dispatcher->dispatchTyped(new OC\Authentication\Events\LoginFailed($user));

if ($currentDelay === 0) {
$throttler->sleepDelay($request->getRemoteAddress(), 'login');
}
$this->handleLoginFailed($throttler, $currentDelay, $remoteAddress, $user, $password);
return false;
}
}
Expand All @@ -486,6 +484,17 @@ public function logClientIn($user,
return true;
}

private function handleLoginFailed(Throttler $throttler, int $currentDelay, string $remoteAddress, string $user, ?string $password) {
$this->logger->warning("Login failed: '" . $user . "' (Remote IP: '" . $remoteAddress . "')", ['app' => 'core']);

$throttler->registerAttempt('login', $remoteAddress, ['user' => $user]);
$this->dispatcher->dispatchTyped(new OC\Authentication\Events\LoginFailed($user));

if ($currentDelay === 0) {
$throttler->sleepDelay($remoteAddress, 'login');
}
}

protected function supportsCookies(IRequest $request) {
if (!is_null($request->getCookie('cookie_test'))) {
return true;
Expand Down Expand Up @@ -574,11 +583,11 @@ protected function prepareUserLogin($firstTimeLogin, $refreshCsrfToken = true) {
*
* @todo do not allow basic auth if the user is 2FA enforced
* @param IRequest $request
* @param OC\Security\Bruteforce\Throttler $throttler
* @param Throttler $throttler
* @return boolean if the login was successful
*/
public function tryBasicAuthLogin(IRequest $request,
OC\Security\Bruteforce\Throttler $throttler) {
Throttler $throttler) {
if (!empty($request->server['PHP_AUTH_USER']) && !empty($request->server['PHP_AUTH_PW'])) {
try {
if ($this->logClientIn($request->server['PHP_AUTH_USER'], $request->server['PHP_AUTH_PW'], $request, $throttler)) {
Expand Down