diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-02-02 06:26:35 -0800 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-02-02 06:26:35 -0800 |
| commit | f8d6a07392f73bc7b85418a60047d761661a7657 (patch) | |
| tree | cfefda4a9dab1019c9e6fad96c8055cec5b03c9e /phpBB/config | |
| parent | cb04252fbd17ac718c09ecc44dab4c7627a98b35 (diff) | |
| parent | b094c7999660703370566018bf449a9280148b8d (diff) | |
| download | forums-f8d6a07392f73bc7b85418a60047d761661a7657.tar forums-f8d6a07392f73bc7b85418a60047d761661a7657.tar.gz forums-f8d6a07392f73bc7b85418a60047d761661a7657.tar.bz2 forums-f8d6a07392f73bc7b85418a60047d761661a7657.tar.xz forums-f8d6a07392f73bc7b85418a60047d761661a7657.zip | |
Merge pull request #1716 from marc1706/feature/passwords
[feature/passwords] Add password hashing manager with support for newer hashing algorithms
Diffstat (limited to 'phpBB/config')
| -rw-r--r-- | phpBB/config/auth_providers.yml | 3 | ||||
| -rw-r--r-- | phpBB/config/passwords.yml | 62 | ||||
| -rw-r--r-- | phpBB/config/services.yml | 1 |
3 files changed, 66 insertions, 0 deletions
diff --git a/phpBB/config/auth_providers.yml b/phpBB/config/auth_providers.yml index e1c289334e..43648b4ad3 100644 --- a/phpBB/config/auth_providers.yml +++ b/phpBB/config/auth_providers.yml @@ -10,6 +10,7 @@ services: arguments: - @dbal.conn - @config + - @passwords.manager - @request - @user - %core.root_path% @@ -21,6 +22,7 @@ services: arguments: - @dbal.conn - @config + - @passwords.manager - @request - @user - %core.root_path% @@ -32,6 +34,7 @@ services: arguments: - @dbal.conn - @config + - @passwords.manager - @user tags: - { name: auth.provider } diff --git a/phpBB/config/passwords.yml b/phpBB/config/passwords.yml new file mode 100644 index 0000000000..9e249a2c12 --- /dev/null +++ b/phpBB/config/passwords.yml @@ -0,0 +1,62 @@ +parameters: + passwords.algorithms: + - passwords.driver.bcrypt_2y + - passwords.driver.bcrypt + - passwords.driver.salted_md5 + - passwords.driver.phpass + +services: + passwords.driver.bcrypt: + class: phpbb\passwords\driver\bcrypt + arguments: + - @config + - @passwords.driver_helper + tags: + - { name: passwords.driver } + + passwords.driver.bcrypt_2y: + class: phpbb\passwords\driver\bcrypt_2y + arguments: + - @config + - @passwords.driver_helper + tags: + - { name: passwords.driver } + + passwords.driver.salted_md5: + class: phpbb\passwords\driver\salted_md5 + arguments: + - @config + - @passwords.driver_helper + tags: + - { name: passwords.driver } + + passwords.driver.phpass: + class: phpbb\passwords\driver\phpass + arguments: + - @config + - @passwords.driver_helper + tags: + - { name: passwords.driver } + + passwords.driver_collection: + class: phpbb\di\service_collection + arguments: + - @service_container + tags: + - { name: service_collection, tag: passwords.driver } + + passwords.driver_helper: + class: phpbb\passwords\driver\helper + arguments: + - @config + + passwords.manager: + class: phpbb\passwords\manager + arguments: + - @config + - @passwords.driver_collection + - @passwords.helper + - %passwords.algorithms% + + passwords.helper: + class: phpbb\passwords\helper diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index c11184d6b6..8f7a7676ad 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -8,6 +8,7 @@ imports: - { resource: auth_providers.yml } - { resource: console.yml } - { resource: mimetype_guessers.yml } + - { resource: passwords.yml } services: acl.permissions: |