Skip to content

[stable10] Keep redirect_url on failed auth #28511

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 2 commits into from
Jul 31, 2017
Merged

[stable10] Keep redirect_url on failed auth #28511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27d6c90
[stable10] Keep redirect_url on failed auth
butonic Jun 28, 2017
04b7134
Add test for failed login where the redirect url is kept ....
DeepDiver1975 Jul 17, 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
9 changes: 8 additions & 1 deletion core/Controller/LoginController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,15 @@ public function tryLogin($user, $password, $redirect_url) {
$this->session->set('loginMessages', [
['invalidpassword'], []
]);
$args = [];
// Read current user and append if possible - we need to return the unmodified user otherwise we will leak the login name
$args = !is_null($user) ? ['user' => $originalUser] : [];
if (!is_null($user)) {
$args['user'] = $originalUser;
}
// keep the redirect url
if (!empty($redirect_url)) {
$args['redirect_url'] = $redirect_url;
}
return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args));
}
// TODO: remove password checks from above and let the user session handle failures
Expand Down
6 changes: 3 additions & 3 deletions tests/Core/Controller/LoginControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ public function testShowLoginFormForUserNamedNull() {
}

public function testLoginWithInvalidCredentials() {
$user = $this->createMock(IUser::class);
$user = 'unknown';
$password = 'secret';
$loginPageUrl = 'some url';

Expand All @@ -295,14 +295,14 @@ public function testLoginWithInvalidCredentials() {
->will($this->returnValue(false));
$this->urlGenerator->expects($this->once())
->method('linkToRoute')
->with('core.login.showLoginForm')
->with('core.login.showLoginForm', ['user' => $user, 'redirect_url' => '/foo'])
->will($this->returnValue($loginPageUrl));

$this->userSession->expects($this->never())
->method('createSessionToken');

$expected = new RedirectResponse($loginPageUrl);
$this->assertEquals($expected, $this->loginController->tryLogin($user, $password, ''));
$this->assertEquals($expected, $this->loginController->tryLogin($user, $password, '/foo'));
}

public function testLoginWithValidCredentials() {
Expand Down