Commitdca28a2

committed

[PasswordHasher] Prevent PHP fatal error when using auto algorithm

1 parent10607db commitdca28a2Copy full SHA for dca28a2

File tree

+17

-2

lines changed

src/Symfony/Component/PasswordHasher
- Hasher
  - PasswordHasherFactory.php
- Tests/Hasher
  - PasswordHasherFactoryTest.php

+17

-2

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -116,9 +116,13 @@ private function getHasherConfigFromAlgorithm(array $config): array`
`116`	`116`	`if ('auto' ===$config['algorithm']) {`
`117`	`117`	`// "plaintext" is not listed as any leaked hashes could then be used to authenticate directly`
`118`	`118`	`if (SodiumPasswordHasher::isSupported()) {`
`119`		`-$algorithms = ['native','sodium','pbkdf2',$config['hash_algorithm']];`
	`119`	`+$algorithms = ['native','sodium','pbkdf2'];`
`120`	`120`	`}else {`
`121`		`-$algorithms = ['native','pbkdf2',$config['hash_algorithm']];`
	`121`	`+$algorithms = ['native','pbkdf2'];`
	`122`	`+ }`
	`123`	`+`
	`124`	`+if ($config['hash_algorithm'] ??'') {`
	`125`	`+$algorithms[] =$config['hash_algorithm'];`
`122`	`126`	`}`
`123`	`127`
`124`	`128`	`$hasherChain = [];`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`useSymfony\Component\PasswordHasher\Hasher\PasswordHasherAwareInterface;`
`19`	`19`	`useSymfony\Component\PasswordHasher\Hasher\PasswordHasherFactory;`
`20`	`20`	`useSymfony\Component\PasswordHasher\Hasher\SodiumPasswordHasher;`
	`21`	`+useSymfony\Component\PasswordHasher\PasswordHasherInterface;`
`21`	`22`	`useSymfony\Component\Security\Core\Encoder\PlaintextPasswordEncoder;`
`22`	`23`	`useSymfony\Component\Security\Core\User\InMemoryUser;`
`23`	`24`	`useSymfony\Component\Security\Core\User\UserInterface;`
`@@ -85,6 +86,16 @@ public function testGetHasherConfiguredForConcreteClassWithClassName()`
`85`	`86`	`$this->assertEquals($expectedHasher->hash('foo',''),$hasher->hash('foo',''));`
`86`	`87`	`}`
`87`	`88`
	`89`	`+publicfunctiontestGetHasherConfiguredWithAuto()`
	`90`	`+ {`
	`91`	`+$factory =newPasswordHasherFactory([`
	`92`	`+'auto' => ['algorithm' =>'auto'],`
	`93`	`+ ]);`
	`94`	`+`
	`95`	`+$hasher =$factory->getPasswordHasher('auto');`
	`96`	`+$this->assertInstanceOf(PasswordHasherInterface::class,$hasher);`
	`97`	`+ }`
	`98`	`+`
`88`	`99`	`publicfunctiontestGetNamedHasherForHasherAware()`
`89`	`100`	`{`
`90`	`101`	`$factory =newPasswordHasherFactory([`

Comments

(0)