Tentative de régler le bordel

This commit is contained in:
Gauvain Boiché
2020-03-31 15:58:31 +02:00
parent a1864c0414
commit 459b46df7b
345 changed files with 10758 additions and 4066 deletions

View File

@@ -14,6 +14,8 @@ parameters:
# List of default password driver types
passwords.algorithms:
- passwords.driver.argon2id
- passwords.driver.argon2i
- passwords.driver.bcrypt_2y
- passwords.driver.bcrypt
- passwords.driver.salted_md5

View File

@@ -27,6 +27,7 @@ imports:
- { resource: services_text_formatter.yml }
- { resource: services_text_reparser.yml }
- { resource: services_twig.yml }
- { resource: services_ucp.yml }
- { resource: services_user.yml }
- { resource: tables.yml }
@@ -122,7 +123,13 @@ services:
group_helper:
class: phpbb\group\helper
arguments:
- '@auth'
- '@cache'
- '@config'
- '@language'
- '@dispatcher'
- '@path_helper'
- '@user'
log:
class: phpbb\log\log

View File

@@ -15,12 +15,12 @@ services:
auth.provider.db:
class: phpbb\auth\provider\db
arguments:
- '@dbal.conn'
- '@captcha.factory'
- '@config'
- '@dbal.conn'
- '@passwords.manager'
- '@request'
- '@user'
- '@service_container'
- '%core.root_path%'
- '%core.php_ext%'
tags:
@@ -29,9 +29,9 @@ services:
auth.provider.apache:
class: phpbb\auth\provider\apache
arguments:
- '@dbal.conn'
- '@config'
- '@passwords.manager'
- '@dbal.conn'
- '@language'
- '@request'
- '@user'
- '%core.root_path%'
@@ -42,9 +42,9 @@ services:
auth.provider.ldap:
class: phpbb\auth\provider\ldap
arguments:
- '@dbal.conn'
- '@config'
- '@passwords.manager'
- '@dbal.conn'
- '@language'
- '@user'
tags:
- { name: auth.provider }
@@ -52,18 +52,18 @@ services:
auth.provider.oauth:
class: phpbb\auth\provider\oauth\oauth
arguments:
- '@dbal.conn'
- '@config'
- '@passwords.manager'
- '@dbal.conn'
- '@auth.provider.db'
- '@dispatcher'
- '@language'
- '@request'
- '@auth.provider.oauth.service_collection'
- '@user'
- '%tables.auth_provider_oauth_token_storage%'
- '%tables.auth_provider_oauth_states%'
- '%tables.auth_provider_oauth_account_assoc%'
- '@auth.provider.oauth.service_collection'
- '%tables.users%'
- '@service_container'
- '@dispatcher'
- '%core.root_path%'
- '%core.php_ext%'
tags:

View File

@@ -158,14 +158,6 @@ services:
tags:
- { name: console.command }
console.command.fixup.recalculate_email_hash:
class: phpbb\console\command\fixup\recalculate_email_hash
arguments:
- '@user'
- '@dbal.conn'
tags:
- { name: console.command }
console.command.fixup.update_hashes:
class: phpbb\console\command\fixup\update_hashes
arguments:

View File

@@ -3,6 +3,7 @@ services:
class: phpbb\cron\manager
arguments:
- '@cron.task_collection'
- '@routing.helper'
- '%core.root_path%'
- '%core.php_ext%'
@@ -13,6 +14,18 @@ services:
- '@config'
- '@dbal.conn'
cron.controller:
class: phpbb\cron\controller\cron
cron.event_listener:
class: phpbb\cron\event\cron_runner_listener
arguments:
- '@cron.lock_db'
- '@cron.manager'
- '@request'
tags:
- { name: kernel.event_subscriber }
# ----- Cron tasks -----
cron.task_collection:
class: phpbb\di\service_collection

View File

@@ -1,4 +1,7 @@
parameters:
passwords.driver.argon2_memory_cost: 1024
passwords.driver.argon2_threads: 2
passwords.driver.argon2_time_cost: 2
passwords.driver.bcrypt_cost: 10
services:
@@ -27,6 +30,23 @@ services:
tags:
- { name: service_collection, tag: passwords.driver }
passwords.driver.argon2i:
class: phpbb\passwords\driver\argon2i
arguments:
- '@config'
- '@passwords.driver_helper'
- '%passwords.driver.argon2_memory_cost%'
- '%passwords.driver.argon2_threads%'
- '%passwords.driver.argon2_time_cost%'
tags:
- { name: passwords.driver }
passwords.driver.argon2id:
class: phpbb\passwords\driver\argon2id
parent: passwords.driver.argon2i
tags:
- { name: passwords.driver }
passwords.driver.bcrypt:
class: phpbb\passwords\driver\bcrypt
arguments:

View File

@@ -12,8 +12,6 @@ services:
class: Symfony\Component\HttpKernel\EventListener\RouterListener
arguments:
- '@router'
- null
- null
- '@request_stack'
tags:
- { name: kernel.event_subscriber }

View File

@@ -4,6 +4,11 @@ parameters:
text_formatter.cache.renderer.key: _text_formatter_renderer
services:
text_formatter.acp_utils:
class: phpbb\textformatter\s9e\acp_utils
arguments:
- '@text_formatter.s9e.factory'
text_formatter.cache:
alias: text_formatter.s9e.factory

View File

@@ -38,10 +38,23 @@ services:
class: phpbb\template\twig\extension
arguments:
- '@template_context'
- '@template.twig.environment'
- '@language'
tags:
- { name: twig.extension }
template.twig.extensions.avatar:
class: phpbb\template\twig\extension\avatar
tags:
- { name: twig.extension }
template.twig.extensions.config:
class: phpbb\template\twig\extension\config
arguments:
- '@config'
tags:
- { name: twig.extension }
template.twig.extensions.routing:
class: phpbb\template\twig\extension\routing
arguments:
@@ -49,6 +62,11 @@ services:
tags:
- { name: twig.extension }
template.twig.extensions.username:
class: phpbb\template\twig\extension\username
tags:
- { name: twig.extension }
template.twig.extensions.debug:
class: Twig_Extension_Debug

View File

@@ -0,0 +1,17 @@
services:
phpbb.ucp.controller.reset_password:
class: phpbb\ucp\controller\reset_password
arguments:
- '@config'
- '@dbal.conn'
- '@dispatcher'
- '@controller.helper'
- '@language'
- '@log'
- '@passwords.manager'
- '@request'
- '@template'
- '@user'
- '%tables.users%'
- '%core.root_path%'
- '%core.php_ext%'