Files
postfixadmin/tests/PasswordChangeAttemptTest.php
T
David Goodwin ae85e51f6e Security fixes (master only) (#1165)
Someone wishing to remain anonymous emailed @cboltz a number of security issues, summarised below.

1. fix sql injection bug in getPageBrowser - search keys bypass the field filter, due to 2a6f27c3 / #1127
2. when performing a password change, do not start the session before the new password has been validated for compexity etc - as things stand someone with a recovery code gets logged in even if their password gets
rejected. Also invalid recovery code on failure.
3. broadcast-message.php was using smtp_mail() with incorrect args, and passing the SMTP password in as the mail body. - probably related to commit 7f1d78e and 42a664e9c2
4. a regular (non-admin) user could submit an arbitrary username in the POST data and create/edit a TOTP exception for another user or entire domain

PR includes refactoring of the password change code (into PasswordChangeAttempt) to make it easier to test/verify.
2026-10-17 09:27:59 +01:00

122 lines
5.1 KiB
PHP

<?php
use PHPUnit\Framework\TestCase;
/**
* Regression tests for the security fix around PasswordChangeAttempt::run():
* the recovery code must never be invalidated (and the caller must never be
* told to create a session) unless the new password was actually validated
* and persisted.
*/
class PasswordChangeAttemptTest extends TestCase
{
private function mailboxHandler(): MailboxHandler
{
return $this->createMock(MailboxHandler::class);
}
private function totpPf(bool $usesTotp = false): TotpPf
{
$totppf = $this->createMock(TotpPf::class);
$totppf->method('usesTOTP')->willReturn($usesTotp);
return $totppf;
}
/**
* run() only makes sense for the two PFAHandler subclasses that represent an
* account with a login/recovery code. Enforced via the MailboxHandler|AdminHandler
* parameter type, so any other PFAHandler subclass - e.g. AliasHandler, which has
* no concept of a recovery code or a password to save - must be rejected by PHP's
* own type check before run() does anything.
*/
public function testHandlerMustBeMailboxOrAdminHandler(): void
{
$this->expectException(\TypeError::class);
/** @phpstan-ignore-next-line intentionally wrong type, to prove it is rejected */
PasswordChangeAttempt::run($this->createMock(AliasHandler::class), $this->totpPf(), 'bob', 'code', '', 'newpass', 'newpass');
}
public function testWrongRecoveryCodeFailsWithoutTouchingTheHandlerFurther(): void
{
$handler = $this->mailboxHandler();
$handler->method('checkPasswordRecoveryCode')->willReturn(false);
$handler->expects($this->never())->method('init');
$handler->expects($this->never())->method('wipePasswordRecoveryCode');
$result = PasswordChangeAttempt::run($handler, $this->totpPf(), 'bob', 'wrong-code', '', 'newpass', 'newpass');
$this->assertFalse($result['success']);
$this->assertEquals([Config::lang('pPassword_code_text_error')], $result['errors']);
}
public function testWrongTotpCodeFailsWithoutSavingThePassword(): void
{
$handler = $this->mailboxHandler();
$handler->method('checkPasswordRecoveryCode')->willReturn(true);
$handler->expects($this->never())->method('init');
$handler->expects($this->never())->method('wipePasswordRecoveryCode');
$totppf = $this->totpPf(true);
$totppf->method('checkUserTOTP')->willReturn(false);
$result = PasswordChangeAttempt::run($handler, $totppf, 'bob', 'code', 'wrong-totp', 'newpass', 'newpass');
$this->assertFalse($result['success']);
$this->assertEquals([Config::lang('pTotp_failed')], $result['errors']);
}
/**
* The bug: a failing save() (e.g. new password fails complexity rules) must not
* wipe the recovery code - otherwise it stays usable for another attempt, and the
* caller would previously have already created an authenticated session for it.
*/
public function testFailedSaveDoesNotWipeRecoveryCode(): void
{
$handler = $this->mailboxHandler();
$handler->method('checkPasswordRecoveryCode')->willReturn(true);
$handler->method('init')->willReturn(true);
$handler->result = ['username' => 'bob'];
$handler->method('set')->willReturn(true);
$handler->method('save')->willReturn(false);
$handler->errormsg = ['password does not meet the rules'];
$handler->expects($this->never())->method('wipePasswordRecoveryCode');
$result = PasswordChangeAttempt::run($handler, $this->totpPf(), 'bob', 'code', '', 'bad', 'bad');
$this->assertFalse($result['success']);
$this->assertEquals(['password does not meet the rules'], $result['errors']);
}
public function testHandlerInitFailureIsReportedWithoutWipingTheCode(): void
{
$handler = $this->mailboxHandler();
$handler->method('checkPasswordRecoveryCode')->willReturn(true);
$handler->method('init')->willReturn(false);
$handler->errormsg = ['no such user'];
$handler->expects($this->never())->method('wipePasswordRecoveryCode');
$handler->expects($this->never())->method('set');
$result = PasswordChangeAttempt::run($handler, $this->totpPf(), 'bob', 'code', '', 'newpass', 'newpass');
$this->assertFalse($result['success']);
$this->assertEquals(['no such user'], $result['errors']);
}
public function testSuccessfulChangeWipesTheRecoveryCodeExactlyOnce(): void
{
$handler = $this->mailboxHandler();
$handler->method('checkPasswordRecoveryCode')->willReturn(true);
$handler->method('init')->willReturn(true);
$handler->result = ['username' => 'bob'];
$handler->method('set')->willReturn(true);
$handler->method('save')->willReturn(true);
$handler->expects($this->once())->method('wipePasswordRecoveryCode')->with('bob');
$result = PasswordChangeAttempt::run($handler, $this->totpPf(), 'bob', 'code', '', 'newpass', 'newpass');
$this->assertTrue($result['success']);
$this->assertEquals([], $result['errors']);
}
}