Skip to content

[Stable10] Backport loginController now emitting failedLogin hook signal after failed login #28631

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
PVince81 merged 5 commits into from
Aug 9, 2017
Merged

[Stable10] Backport loginController now emitting failedLogin hook signal after failed login #28631

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5e74265
loginController now emitting preLogin hook signal before failed login…
karakayasemi Jun 24, 2017
f8e2940
add failedLogin hook to detect failed login attempts
karakayasemi Jun 28, 2017
134b685
Login: Use userSession to determine the uid
Jul 13, 2017
1170cf4
Update tests to work with new tryLogin call structure
Jul 20, 2017
19101eb
Rename second `$loginResult` occurrence
Jul 24, 2017
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
loginController now emitting preLogin hook signal before failed login… 
… attempts
  • Loading branch information
@karakayasemi
karakayasemi committed Aug 9, 2017
commit 5e74265c92a58d6c1ba6f52b900a23ae56413166
17 changes: 6 additions & 11 deletions core/Controller/LoginController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,17 +197,11 @@ public function showLoginForm($user, $redirect_url, $remember_login) {
public function tryLogin($user, $password, $redirect_url) {
$originalUser = $user;
// TODO: Add all the insane error handling
/* @var $loginResult IUser */
$loginResult = $this->userManager->checkPassword($user, $password);
if ($loginResult === false) {
$users = $this->userManager->getByEmail($user);
// we only allow login by email if unique
if (count($users) === 1) {
$user = $users[0]->getUID();
$loginResult = $this->userManager->checkPassword($user, $password);
}
$emailUsers = $this->userManager->getByEmail($user);
if (count($emailUsers) === 1) {
$user = $emailUsers[0]->getUID();
}
if ($loginResult === false) {
if ($this->userSession->login($user, $password) !== true) {
$this->session->set('loginMessages', [
['invalidpassword'], []
]);
Expand All @@ -222,9 +216,10 @@ public function tryLogin($user, $password, $redirect_url) {
}
return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args));
}
/* @var $loginResult IUser */
$loginResult = $this->userManager->get($user);
// TODO: remove password checks from above and let the user session handle failures
// requires https://github.com/owncloud/core/pull/24616
$this->userSession->login($user, $password);
$this->userSession->createSessionToken($this->request, $loginResult->getUID(), $user, $password);

// User has successfully logged in, now remove the password reset link, when it is available
Expand Down
36 changes: 21 additions & 15 deletions tests/Core/Controller/LoginControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,8 +307,8 @@ public function testLoginWithInvalidCredentials() {
$password = 'secret';
$loginPageUrl = 'some url';

$this->userManager->expects($this->once())
->method('checkPassword')
$this->userSession->expects($this->once())
->method('login')
->will($this->returnValue(false));
$this->urlGenerator->expects($this->once())
->method('linkToRoute')
Expand All @@ -328,12 +328,14 @@ public function testLoginWithValidCredentials() {
$password = 'secret';
$indexPageUrl = 'some url';

$this->userManager->expects($this->once())
->method('checkPassword')
->will($this->returnValue($user));
$this->userSession->expects($this->once())
->method('login')
->with($user, $password);
->with($user, $password)
->will($this->returnValue(true));
$this->userManager->expects($this->once())
->method('get')
->with($user)
->will($this->returnValue($user));
$this->userSession->expects($this->once())
->method('createSessionToken')
->with($this->request, $user->getUID(), $user, $password);
Expand Down Expand Up @@ -374,9 +376,13 @@ public function testLoginWithValidCredentialsAndRedirectUrl() {
$originalUrl = 'another%20url';
$redirectUrl = 'http://localhost/another url';

$this->userManager->expects($this->once())
->method('checkPassword')
$this->userSession->expects($this->once())
->method('login')
->with('Jane', $password)
->will($this->returnValue(true));
$this->userManager->expects($this->once())
->method('get')
->with('Jane')
->will($this->returnValue($user));
$this->userSession->expects($this->once())
->method('createSessionToken')
Expand All @@ -403,8 +409,11 @@ public function testLoginWithTwoFactorEnforced() {
$password = 'secret';
$challengeUrl = 'challenge/url';

$this->userSession->expects($this->once())
->method('login')
->will($this->returnValue(true));
$this->userManager->expects($this->once())
->method('checkPassword')
->method('get')
->will($this->returnValue($user));
$this->userSession->expects($this->once())
->method('login')
Expand Down Expand Up @@ -435,12 +444,9 @@ public function testToNotLeakLoginName() {
->method('getUID')
->will($this->returnValue('john'));

$this->userManager->expects($this->exactly(2))
->method('checkPassword')
->withConsecutive(
['[email protected]', 'just wrong'],
['john', 'just wrong']
)
$this->userSession->expects($this->once())
->method('login')
->with('john', 'just wrong')
->willReturn(false);

$this->userManager->expects($this->once())
Expand Down