Pass repo settings directly to the hasher

Author: glye

src/bundle/Core/DependencyInjection/Configuration/Parser/Repository/PasswordHash.php

@@ -8,9 +8,7 @@
 
 namespace Ibexa\Bundle\Core\DependencyInjection\Configuration\Parser\Repository;
 
-use Ibexa\Bundle\Core\DependencyInjection\Configuration\AbstractParser;
 use Ibexa\Bundle\Core\DependencyInjection\Configuration\RepositoryConfigParserInterface;
-use Ibexa\Bundle\Core\DependencyInjection\Configuration\SiteAccessAware\ContextualizerInterface;
 use Ibexa\Contracts\Core\Repository\Values\User\User;
 use Symfony\Component\Config\Definition\Builder\NodeBuilder;
 
@@ -29,7 +27,7 @@
  *              update_type_on_change: false
  * ```
  */
-final class PasswordHash extends AbstractParser implements RepositoryConfigParserInterface
+final class PasswordHash implements RepositoryConfigParserInterface
 {
     public function addSemanticConfig(NodeBuilder $nodeBuilder): void
     {
@@ -40,6 +38,7 @@ public function addSemanticConfig(NodeBuilder $nodeBuilder): void
                     ->integerNode('default_type')
                         ->info('Default password hash type, see the constants in Ibexa\Contracts\Core\Repository\Values\User\User.')
                         ->example('!php/const:Ibexa\Contracts\Core\Repository\Values\User\User::PASSWORD_HASH_PHP_DEFAULT')
+                        ->defaultValue(User::PASSWORD_HASH_PHP_DEFAULT)
                         ->validate()
                             ->ifTrue(static function ($value): bool {
                                 $hashType = (int) $value;
@@ -58,26 +57,9 @@ public function addSemanticConfig(NodeBuilder $nodeBuilder): void
                     ->booleanNode('update_type_on_change')
                         ->info('Whether the password hash type should be changed when the password is changed if it differs from the default type.')
                         ->example('false')
+                        ->defaultFalse()
                     ->end()
                 ->end()
             ->end();
     }
-
-    /**
-     * @param array<string, mixed> $scopeSettings
-     */
-    public function mapConfig(array &$scopeSettings, $currentScope, ContextualizerInterface $contextualizer): void
-    {
-        if (!isset($scopeSettings['password_hash'])) {
-            return;
-        }
-
-        $settings = $scopeSettings['password_hash'];
-        if (isset($settings['default_type'])) {
-            $contextualizer->setContextualParameter('password_hash.default_type', $currentScope, $settings['default_type']);
-        }
-        if (isset($settings['update_type_on_change'])) {
-            $contextualizer->setContextualParameter('password_hash.update_type_on_change', $currentScope, $settings['update_type_on_change']);
-        }
-    }
 }

src/contracts/Repository/PasswordHashService.php

@@ -10,6 +10,20 @@
 
 interface PasswordHashService
 {
+    /**
+     * Sets the default password hash type.
+     *
+     * @param int $defaultHashType The default password hash type, one of Ibexa\Contracts\Core\Repository\Values\User\User::SUPPORTED_PASSWORD_HASHES.
+     */
+    public function setDefaultHashType(int $defaultHashType): void;
+
+    /**
+     * Sets whether the password hash type should be updated when the password is changed.
+     *
+     * @param bool $updateTypeOnChange Whether to update the password hash type on change.
+     */
+    public function setUpdateTypeOnChange(bool $updateTypeOnChange): void;
+
     /**
      * Returns default password hash type.
      *

src/lib/Base/Container/ApiLoader/RepositoryFactory.php

@@ -18,6 +18,7 @@
 use Ibexa\Contracts\Core\Repository\PermissionService;
 use Ibexa\Contracts\Core\Repository\Repository;
 use Ibexa\Contracts\Core\Repository\Validator\ContentValidator;
+use Ibexa\Contracts\Core\Repository\Values\User\User;
 use Ibexa\Contracts\Core\Search\Handler as SearchHandler;
 use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Ibexa\Core\Base\Exceptions\InvalidArgumentException;
@@ -98,6 +99,11 @@ public function buildRepository(
     ): Repository {
         $config = $this->repositoryConfigurationProvider->getRepositoryConfig();
 
+        if (isset($config['password_hash'])) {
+            $passwordHashService->setDefaultHashType($config['password_hash']['default_type'] ?? User::PASSWORD_HASH_PHP_DEFAULT);
+            $passwordHashService->setUpdateTypeOnChange($config['password_hash']['update_type_on_change'] ?? false);
+        }
+
         return new CoreRepository(
             $persistenceHandler,
             $searchHandler,

src/lib/Repository/User/PasswordHashService.php

@@ -8,7 +8,6 @@
 
 namespace Ibexa\Core\Repository\User;
 
-use Ibexa\Contracts\Core\Container\ApiLoader\RepositoryConfigurationProviderInterface;
 use Ibexa\Contracts\Core\Repository\PasswordHashService as PasswordHashServiceInterface;
 use Ibexa\Contracts\Core\Repository\Values\User\User;
 use Ibexa\Core\Repository\User\Exception\PasswordHashTypeNotCompiled;
@@ -19,11 +18,26 @@
  */
 final class PasswordHashService implements PasswordHashServiceInterface
 {
-    private RepositoryConfigurationProviderInterface $repositoryConfigurationProvider;
+    private int $defaultHashType;
 
-    public function __construct(RepositoryConfigurationProviderInterface $repositoryConfigurationProvider)
+    private bool $updateTypeOnChange;
+
+    public function __construct(
+        int $defaultHashType = User::PASSWORD_HASH_PHP_DEFAULT,
+        bool $updateTypeOnChange = false
+    ) {
+        $this->defaultHashType = $defaultHashType;
+        $this->updateTypeOnChange = $updateTypeOnChange;
+    }
+
+    public function setDefaultHashType(int $defaultHashType): void
+    {
+        $this->defaultHashType = $defaultHashType;
+    }
+
+    public function setUpdateTypeOnChange(bool $updateTypeOnChange): void
     {
-        $this->repositoryConfigurationProvider = $repositoryConfigurationProvider;
+        $this->updateTypeOnChange = $updateTypeOnChange;
     }
 
     public function getSupportedHashTypes(): array
@@ -38,9 +52,7 @@ public function isHashTypeSupported(int $hashType): bool
 
     public function getDefaultHashType(): int
     {
-        $config = $this->repositoryConfigurationProvider->getRepositoryConfig();
-
-        return $config['password_hash']['default_type'];
+        return $this->defaultHashType;
     }
 
     public function createPasswordHash(
@@ -107,8 +119,6 @@ public function isValidPassword(
 
     public function shouldPasswordHashTypeBeUpdatedOnChange(): bool
     {
-        $config = $this->repositoryConfigurationProvider->getRepositoryConfig();
-
-        return $config['password_hash']['update_type_on_change'];
+        return $this->updateTypeOnChange;
     }
 }

src/lib/Resources/settings/fieldtype_services.yml

@@ -60,9 +60,7 @@ services:
 
     Ibexa\Core\FieldType\FieldTypeRegistry: ~
 
-    Ibexa\Core\Repository\User\PasswordHashService:
-        arguments:
-            $repositoryConfigurationProvider: '@Ibexa\Core\Base\Container\ApiLoader\RepositoryConfigurationProvider'
+    Ibexa\Core\Repository\User\PasswordHashService: ~
 
     Ibexa\Contracts\Core\Repository\PasswordHashService:
         alias: Ibexa\Core\Repository\User\PasswordHashService

tests/lib/Repository/User/PasswordHashServiceTest.php

@@ -9,8 +9,6 @@
 namespace Ibexa\Tests\Core\Repository\User;
 
 use Ibexa\Contracts\Core\Repository\Values\User\User;
-use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
-use Ibexa\Core\Base\Container\ApiLoader\RepositoryConfigurationProvider;
 use Ibexa\Core\Repository\User\Exception\UnsupportedPasswordHashType;
 use Ibexa\Core\Repository\User\PasswordHashService;
 use Ibexa\Tests\Bundle\Core\ApiLoader\BaseRepositoryConfigurationProviderTestCase;
@@ -23,13 +21,7 @@ final class PasswordHashServiceTest extends BaseRepositoryConfigurationProviderT
 
     protected function setUp(): void
     {
-        $repositories = [
-            'legacy' => $this->buildNormalizedSingleRepositoryConfig('legacy'),
-        ];
-
-        $configResolver = $this->createMock(ConfigResolverInterface::class);
-        $repositoryConfigurationProvider = new RepositoryConfigurationProvider($configResolver, $repositories);
-        $this->passwordHashService = new PasswordHashService($repositoryConfigurationProvider);
+        $this->passwordHashService = new PasswordHashService();
     }
 
     public function testGetSupportedHashTypes(): void