Skip to content

[stable18] use the loginname to verify the old password in user password changes #21115

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
blizzz merged 1 commit into from
May 27, 2020
Merged

[stable18] use the loginname to verify the old password in user password changes #21115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion apps/settings/lib/Controller/ChangePasswordController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,9 @@ public function __construct(string $appName,
* @BruteForceProtection(action=changePersonalPassword)
*/
public function changePersonalPassword(string $oldpassword = '', string $newpassword = null): JSONResponse {
$loginName = $this->userSession->getLoginName();
/** @var IUser $user */
$user = $this->userManager->checkPassword($this->userId, $oldpassword);
$user = $this->userManager->checkPassword($loginName, $oldpassword);
if ($user === false) {
$response = new JSONResponse([
'status' => 'error',
Expand Down
32 changes: 27 additions & 5 deletions tests/Core/Controller/ChangePasswordControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
class ChangePasswordControllerTest extends \Test\TestCase {
/** @var string */
private $userId = 'currentUser';
/** @var string */
private $loginName = 'ua1337';
/** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */
private $userManager;
/** @var Session|\PHPUnit_Framework_MockObject_MockObject */
Expand Down Expand Up @@ -75,9 +77,13 @@ protected function setUp(): void {
}

public function testChangePersonalPasswordWrongPassword() {
$this->userSession->expects($this->once())
->method('getLoginName')
->willReturn($this->loginName);

$this->userManager->expects($this->once())
->method('checkPassword')
->with($this->userId, 'old')
->with($this->loginName, 'old')
->willReturn(false);

$expects = new JSONResponse([
Expand All @@ -93,10 +99,14 @@ public function testChangePersonalPasswordWrongPassword() {
}

public function testChangePersonalPasswordCommonPassword() {
$this->userSession->expects($this->once())
->method('getLoginName')
->willReturn($this->loginName);

$user = $this->getMockBuilder(IUser::class)->getMock();
$this->userManager->expects($this->once())
->method('checkPassword')
->with($this->userId, 'old')
->with($this->loginName, 'old')
->willReturn($user);

$user->expects($this->once())
Expand All @@ -116,10 +126,14 @@ public function testChangePersonalPasswordCommonPassword() {
}

public function testChangePersonalPasswordNoNewPassword() {
$this->userSession->expects($this->once())
->method('getLoginName')
->willReturn($this->loginName);

$user = $this->getMockBuilder(IUser::class)->getMock();
$this->userManager->expects($this->once())
->method('checkPassword')
->with($this->userId, 'old')
->with($this->loginName, 'old')
->willReturn($user);

$expects = [
Expand All @@ -132,10 +146,14 @@ public function testChangePersonalPasswordNoNewPassword() {
}

public function testChangePersonalPasswordCantSetPassword() {
$this->userSession->expects($this->once())
->method('getLoginName')
->willReturn($this->loginName);

$user = $this->getMockBuilder(IUser::class)->getMock();
$this->userManager->expects($this->once())
->method('checkPassword')
->with($this->userId, 'old')
->with($this->loginName, 'old')
->willReturn($user);

$user->expects($this->once())
Expand All @@ -152,10 +170,14 @@ public function testChangePersonalPasswordCantSetPassword() {
}

public function testChangePersonalPassword() {
$this->userSession->expects($this->once())
->method('getLoginName')
->willReturn($this->loginName);

$user = $this->getMockBuilder(IUser::class)->getMock();
$this->userManager->expects($this->once())
->method('checkPassword')
->with($this->userId, 'old')
->with($this->loginName, 'old')
->willReturn($user);

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