Skip to content

[stable25] fix(dav): Abort requests with 429 instead of waiting #39253

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

[stable25] fix(dav): Abort requests with 429 instead of waiting #39253

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
446ebd3
fix(dav): Abort requests with 429 instead of waiting
nickvergessen Mar 30, 2023
b2776bf
fix: use handleLoginFailed for invalid email address
kesselb Jul 10, 2023
ae691e0
chore: fix codestyle for \OC\Files\Node\Folder
kesselb Jul 10, 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
Prev Previous commit
Next Next commit
fix: use handleLoginFailed for invalid email address 
Signed-off-by: Daniel Kesselberg <[email protected]>
  • Loading branch information
@kesselb
kesselb committed Jul 10, 2023
commit b2776bf58628d22b4555eb3bacd93ae1c616fce2
10 changes: 1 addition & 9 deletions lib/private/User/Session.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,15 +458,7 @@ public function logClientIn($user,
}
$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 Down