Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle changed defaults in Argon2PasswordTest::testPartialConfig()

Browse source 
PHP 7.2.21 and 7.3.8 changed the default settings for PASSWORD_ARGON2I.
Load the default settings at runtime so the test can work.

Bug: T230487
Change-Id: I55a0f1af160c822113c9f86f8f8cce558da61736
This commit is contained in:
Brad Jorsch 2019-08-16 14:44:29 -04:00
parent 94048ef7b6
commit 8698bc3b42
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tests/phpunit/includes/password/Argon2PasswordTest.php
View file

@ -88,6 +88,10 @@ class Argon2PasswordTest extends PasswordTestCase {
}
public function testPartialConfig() {
// The default options changed in PHP 7.2.21 and 7.3.8. This seems to be the only way to
// fetch them at runtime.
$options = password_get_info( password_hash( '', PASSWORD_ARGON2I ) )['options'];
$factory = new PasswordFactory();
$factory->register( 'argon2', [
'class' => Argon2Password::class,
@ -96,7 +100,14 @@ class Argon2PasswordTest extends PasswordTestCase {
$partialPassword = $factory->newFromType( 'argon2' );
$partialPassword->crypt( 'password' );
$fullPassword = $this->passwordFactory->newFromCiphertext( $partialPassword->toString() );
$factory2 = new PasswordFactory();
$factory2->register( 'argon2', [
'class' => Argon2Password::class,
'algo' => 'argon2i',
] + $options );
$fullPassword = $factory2->newFromCiphertext( $partialPassword->toString() );
$this->assertFalse( $fullPassword->needsUpdate(),
'Options not set for a password should fall back to defaults'