1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00

Merge remote-tracking branch 'github-marc1706/ticket/12352' into develop-ascraeus

* github-marc1706/ticket/12352: (33 commits)
  [ticket/12352] Do not check hashes that don't have the necessary length
  [ticket/12352] Update file headers to fit new format
  [ticket/12352] Use custom provider collection for auth providers
  [ticket/12352] Add checks for existing user_pass_convert to migrations
  [ticket/12352] Remove usages of user_pass_convert column
  [ticket/12352] Update schema json file
  [ticket/12352] Remove user_pass_convert column from database
  [ticket/12352] Check each newly added passwords driver in manager_test
  [ticket/12352] Add get_settings_only method to passwords driver base
  [ticket/12352] Add passwords driver for xenforo 1.0, 1.1 passwords
  [ticket/12352] Add tests for wcf1 and wcf2 drivers
  [ticket/12352] Add driver for woltlab community framework 1 passwords
  [ticket/12352] Add driver for woltlab community framework 2 passwords
  [ticket/12352] Add missing $ to md5_mybb and md5_vb driver
  [ticket/12352] Fix spacing in passwords tests
  [ticket/12352] Add passwords driver for vB passwords
  [ticket/12352] Use correct hashing method in md5_mybb driver
  [ticket/12352] Add driver for myBB md5 passwords
  [ticket/12352] Rename phpbb2_md5 driver to fit filenames of other drivers
  [ticket/12352] Add passwords driver for sha1 password hashes
  ...
This commit is contained in:
Nils Adermann
2014-06-11 14:27:57 +02:00
35 changed files with 1335 additions and 113 deletions

View File

@@ -1,8 +1,9 @@
services:
auth.provider_collection:
class: phpbb\di\service_collection
class: phpbb\auth\provider_collection
arguments:
- @service_container
- @config
tags:
- { name: service_collection, tag: auth.provider }
auth.provider.db:

View File

@@ -22,6 +22,14 @@ services:
tags:
- { name: passwords.driver }
passwords.driver.bcrypt_wcf2:
class: phpbb\passwords\driver\bcrypt_wcf2
arguments:
- @passwords.driver.bcrypt
- @passwords.driver_helper
tags:
- { name: passwords.driver }
passwords.driver.salted_md5:
class: phpbb\passwords\driver\salted_md5
arguments:
@@ -38,6 +46,64 @@ services:
tags:
- { name: passwords.driver }
passwords.driver.convert_password:
class: phpbb\passwords\driver\convert_password
arguments:
- @config
- @passwords.driver_helper
tags:
- { name: passwords.driver }
passwords.driver.sha1_smf:
class: phpbb\passwords\driver\sha1_smf
arguments:
- @config
- @passwords.driver_helper
tags:
- { name: passwords.driver }
passwords.driver.sha1_wcf1:
class: phpbb\passwords\driver\sha1_wcf1
arguments:
- @config
- @passwords.driver_helper
tags:
- { name: passwords.driver }
passwords.driver.sha1:
class: phpbb\passwords\driver\sha1
arguments:
- @config
- @passwords.driver_helper
tags:
- { name: passwords.driver }
passwords.driver.md5_phpbb2:
class: phpbb\passwords\driver\md5_phpbb2
arguments:
- @request
- @passwords.driver.salted_md5
- %core.root_path%
- %core.php_ext%
tags:
- { name: passwords.driver }
passwords.driver.md5_mybb:
class: phpbb\passwords\driver\md5_mybb
arguments:
- @config
- @passwords.driver_helper
tags:
- { name: passwords.driver }
passwords.driver.md5_vb:
class: phpbb\passwords\driver\md5_vb
arguments:
- @config
- @passwords.driver_helper
tags:
- { name: passwords.driver }
passwords.driver_collection:
class: phpbb\di\service_collection
arguments: