diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix xml to php migration for security services

Browse Source
This commit is contained in:
Tobias Schultze 2020-06-24 17:56:57 +02:00
parent acc705762a
commit 857123f8bf
5 changed files with 78 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Symfony/Bundle/SecurityBundle/Resources/config/security.php
View File

@ -106,7 +106,9 @@ return static function (ContainerConfigurator $container) {
->args(['none'])
->set('security.encoder_factory.generic', EncoderFactory::class)
->args([[]])
->args([
[],
])
->alias('security.encoder_factory', 'security.encoder_factory.generic')
->alias(EncoderFactoryInterface::class, 'security.encoder_factory')
@ -160,12 +162,12 @@ return static function (ContainerConfigurator $container) {
// Firewall related services
->set('security.firewall', FirewallListener::class)
->tag('kernel.event_subscriber')
->args([
service('security.firewall.map'),
service('event_dispatcher'),
service('security.logout_url_generator'),
])
->tag('kernel.event_subscriber')
->alias(Firewall::class, 'security.firewall')
->set('security.firewall.map', FirewallMap::class)
@ -238,7 +240,7 @@ return static function (ContainerConfigurator $container) {
abstract_arg('uid key'),
abstract_arg('filter'),
abstract_arg('password_attribute'),
[], // extra_fields (email etc)'),
abstract_arg('extra_fields (email etc)'),
])
->set('security.user.provider.chain', ChainUserProvider::class)
@ -253,23 +255,24 @@ return static function (ContainerConfigurator $container) {
// Validator
->set('security.validator.user_password', UserPasswordValidator::class)
->tag('validator.constraint_validator', ['alias' => 'security.validator.user_password'])
->args([
service('security.token_storage'),
service('security.encoder_factory'),
])
->tag('validator.constraint_validator', ['alias' => 'security.validator.user_password'])
// Cache
->set('cache.security_expression_language')
->parent('cache.system')
->private()
->tag('cache.pool')
// Cache Warmers
->set('security.cache_warmer.expression', ExpressionCacheWarmer::class)
->tag('kernel.cache_warmer')
->args([
[],
service('security.expression_language'),
])
->tag('kernel.cache_warmer')
;
};

65
src/Symfony/Bundle/SecurityBundle/Resources/config/security_authenticator.php
View File

@ -24,6 +24,7 @@ use Symfony\Component\Security\Http\Authenticator\RememberMeAuthenticator;
use Symfony\Component\Security\Http\Authenticator\RemoteUserAuthenticator;
use Symfony\Component\Security\Http\Authenticator\X509Authenticator;
use Symfony\Component\Security\Http\EventListener\CheckCredentialsListener;
use Symfony\Component\Security\Http\EventListener\PasswordMigratingListener;
use Symfony\Component\Security\Http\EventListener\RememberMeListener;
use Symfony\Component\Security\Http\EventListener\SessionStrategyListener;
use Symfony\Component\Security\Http\EventListener\UserCheckerListener;
@ -35,15 +36,15 @@ return static function (ContainerConfigurator $container) {
// Manager
->set('security.authenticator.manager', AuthenticatorManager::class)
->abstract()
->tag('monolog.logger', ['channel' => 'security'])
->args([
[], // authenticators
abstract_arg('authenticators'),
service('security.token_storage'),
service('event_dispatcher'),
null, // provider key
abstract_arg('provider key'),
service('logger')->nullOnInvalid(),
param('security.authentication.manager.erase_credentials'),
])
->tag('monolog.logger', ['channel' => 'security'])
->set('security.authenticator.managers_locator', ServiceLocator::class)
->args([[]])
@ -62,15 +63,21 @@ return static function (ContainerConfigurator $container) {
->set('security.firewall.authenticator', AuthenticatorManagerListener::class)
->abstract()
->args([
null, // authenticator manager
abstract_arg('authenticator manager'),
])
// Listeners
->set('security.listener.check_authenticator_credentials', CheckCredentialsListener::class)
->tag('kernel.event_subscriber')
->args([
service('security.encoder_factory'),
])
->tag('kernel.event_subscriber')
->set('security.listener.password_migrating', PasswordMigratingListener::class)
->args([
service('security.encoder_factory'),
])
->tag('kernel.event_subscriber')
->set('security.listener.user_checker', UserCheckerListener::class)
->abstract()
@ -86,74 +93,74 @@ return static function (ContainerConfigurator $container) {
->set('security.listener.remember_me', RememberMeListener::class)
->abstract()
->tag('monolog.logger', ['channel' => 'security'])
->args([
[], // remember me services
abstract_arg('remember me services'),
service('logger')->nullOnInvalid(),
])
->tag('monolog.logger', ['channel' => 'security'])
// Authenticators
->set('security.authenticator.http_basic', HttpBasicAuthenticator::class)
->abstract()
->tag('monolog.logger', ['channel' => 'security'])
->args([
null, // realm name
null, // user provider
abstract_arg('realm name'),
abstract_arg('user provider'),
service('logger')->nullOnInvalid(),
])
->tag('monolog.logger', ['channel' => 'security'])
->set('security.authenticator.form_login', FormLoginAuthenticator::class)
->abstract()
->args([
service('security.http_utils'),
null, // user provider
null, // authentication success handler
null, // authentication failure handler
[], // options
abstract_arg('user provider'),
abstract_arg('authentication success handler'),
abstract_arg('authentication failure handler'),
abstract_arg('options'),
])
->set('security.authenticator.json_login', JsonLoginAuthenticator::class)
->abstract()
->args([
service('security.http_utils'),
null, // user provider
null, // authentication success handler
null, // authentication failure handler
[], // options
abstract_arg('user provider'),
abstract_arg('authentication success handler'),
abstract_arg('authentication failure handler'),
abstract_arg('options'),
service('property_accessor')->nullOnInvalid(),
])
->set('security.authenticator.remember_me', RememberMeAuthenticator::class)
->abstract()
->args([
[], // remember me services
abstract_arg('remember me services'),
param('kernel.secret'),
service('security.token_storage'),
[], // options
abstract_arg('options'),
service('security.authentication.session_strategy'),
])
->set('security.authenticator.x509', X509Authenticator::class)
->abstract()
->tag('monolog.logger', ['channel' => 'security'])
->args([
null, // user provider
abstract_arg('user provider'),
service('security.token_storage'),
null, // firewall name
null, // user key
null, // credentials key
abstract_arg('firewall name'),
abstract_arg('user key'),
abstract_arg('credentials key'),
service('logger')->nullOnInvalid(),
])
->tag('monolog.logger', ['channel' => 'security'])
->set('security.authenticator.remote_user', RemoteUserAuthenticator::class)
->abstract()
->tag('monolog.logger', ['channel' => 'security'])
->args([
null, // user provider
abstract_arg('user provider'),
service('security.token_storage'),
null, // firewall name
null, // user key
abstract_arg('firewall name'),
abstract_arg('user key'),
service('logger')->nullOnInvalid(),
])
->tag('monolog.logger', ['channel' => 'security'])
;
};

4
src/Symfony/Bundle/SecurityBundle/Resources/config/security_debug.php
View File

@ -24,18 +24,18 @@ return static function (ContainerConfigurator $container) {
])
->set('debug.security.voter.vote_listener', VoteListener::class)
->tag('kernel.event_subscriber')
->args([
service('debug.security.access.decision_manager'),
])
->tag('kernel.event_subscriber')
->set('debug.security.firewall', TraceableFirewallListener::class)
->tag('kernel.event_subscriber')
->args([
service('security.firewall.map'),
service('event_dispatcher'),
service('security.logout_url_generator'),
])
->tag('kernel.event_subscriber')
->alias('security.firewall', 'debug.security.firewall')
;
};

54
src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.php
View File

@ -42,13 +42,13 @@ use Symfony\Component\Security\Http\Firewall\X509AuthenticationListener;
return static function (ContainerConfigurator $container) {
$container->services()
->set('security.authentication.listener.anonymous', AnonymousAuthenticationListener::class)
->tag('monolog.logger', ['channel' => 'security'])
->args([
service('security.untracked_token_storage'),
abstract_arg('Key'),
service('logger')->nullOnInvalid(),
service('security.authentication.manager'),
])
->tag('monolog.logger', ['channel' => 'security'])
->set('security.authentication.provider.anonymous', AnonymousAuthenticationProvider::class)
->args([abstract_arg('Key')])
@ -62,17 +62,16 @@ return static function (ContainerConfigurator $container) {
->set('security.authentication.basic_entry_point', BasicAuthenticationEntryPoint::class)
->set('security.channel_listener', ChannelListener::class)
->tag('monolog.logger', ['channel' => 'security'])
->args([
service('security.access_map'),
service('security.authentication.retry_entry_point'),
service('logger')->nullOnInvalid(),
])
->tag('monolog.logger', ['channel' => 'security'])
->set('security.access_map', AccessMap::class)
->set('security.context_listener', ContextListener::class)
->tag('monolog.logger', ['channel' => 'security'])
->args([
service('security.untracked_token_storage'),
[],
@ -81,6 +80,7 @@ return static function (ContainerConfigurator $container) {
service('event_dispatcher')->nullOnInvalid(),
service('security.authentication.trust_resolver'),
])
->tag('monolog.logger', ['channel' => 'security'])
->set('security.logout_listener', LogoutListener::class)
->abstract()
@ -91,9 +91,11 @@ return static function (ContainerConfigurator $container) {
[], // Options
])
->set('security.logout.listener.session', SessionLogoutListener::class)->abstract()
->set('security.logout.listener.session', SessionLogoutListener::class)
->abstract()
->set('security.logout.listener.cookie_clearing', CookieClearingLogoutListener::class)->abstract()
->set('security.logout.listener.cookie_clearing', CookieClearingLogoutListener::class)
->abstract()
->set('security.logout.listener.default', DefaultLogoutListener::class)
->abstract()
@ -110,24 +112,24 @@ return static function (ContainerConfigurator $container) {
->set('security.authentication.listener.abstract')
->abstract()
->tag('monolog.logger', ['channel' => 'security'])
->args([
service('security.token_storage'),
service('security.authentication.manager'),
service('security.authentication.session_strategy'),
service('security.http_utils'),
abstract_arg(''),
abstract_arg('Provider-shared Key'),
service('security.authentication.success_handler'),
service('security.authentication.failure_handler'),
[],
service('logger')->nullOnInvalid(),
service('event_dispatcher')->nullOnInvalid(),
])
->tag('monolog.logger', ['channel' => 'security'])
->set('security.authentication.custom_success_handler', CustomAuthenticationSuccessHandler::class)
->abstract()
->args([
abstract_arg('The custom success handler service id'),
abstract_arg('The custom success handler service'),
[], // Options
abstract_arg('Provider-shared Key'),
])
@ -142,19 +144,19 @@ return static function (ContainerConfigurator $container) {
->set('security.authentication.custom_failure_handler', CustomAuthenticationFailureHandler::class)
->abstract()
->args([
abstract_arg('The custom failure handler service id'),
abstract_arg('The custom failure handler service'),
[], // Options
])
->set('security.authentication.failure_handler', DefaultAuthenticationFailureHandler::class)
->abstract()
->tag('monolog.logger', ['channel' => 'security'])
->args([
service('http_kernel'),
service('security.http_utils'),
[], // Options
service('logger')->nullOnInvalid(),
])
->tag('monolog.logger', ['channel' => 'security'])
->set('security.authentication.listener.form', UsernamePasswordFormAuthenticationListener::class)
->parent('security.authentication.listener.abstract')
@ -162,7 +164,6 @@ return static function (ContainerConfigurator $container) {
->set('security.authentication.listener.x509', X509AuthenticationListener::class)
->abstract()
->tag('monolog.logger', ['channel' => 'security'])
->args([
service('security.token_storage'),
service('security.authentication.manager'),
@ -172,10 +173,10 @@ return static function (ContainerConfigurator $container) {
service('logger')->nullOnInvalid(),
service('event_dispatcher')->nullOnInvalid(),
])
->tag('monolog.logger', ['channel' => 'security'])
->set('security.authentication.listener.json', UsernamePasswordJsonAuthenticationListener::class)
->abstract()
->tag('monolog.logger', ['channel' => 'security'])
->args([
service('security.token_storage'),
service('security.authentication.manager'),
@ -188,10 +189,10 @@ return static function (ContainerConfigurator $container) {
service('event_dispatcher')->nullOnInvalid(),
service('property_accessor')->nullOnInvalid(),
])
->tag('monolog.logger', ['channel' => 'security'])
->set('security.authentication.listener.remote_user', RemoteUserAuthenticationListener::class)
->abstract()
->tag('monolog.logger', ['channel' => 'security'])
->args([
service('security.token_storage'),
service('security.authentication.manager'),
@ -200,10 +201,10 @@ return static function (ContainerConfigurator $container) {
service('logger')->nullOnInvalid(),
service('event_dispatcher')->nullOnInvalid(),
])
->tag('monolog.logger', ['channel' => 'security'])
->set('security.authentication.listener.basic', BasicAuthenticationListener::class)
->abstract()
->tag('monolog.logger', ['channel' => 'security'])
->args([
service('security.token_storage'),
service('security.authentication.manager'),
@ -211,6 +212,7 @@ return static function (ContainerConfigurator $container) {
abstract_arg('Entry Point'),
service('logger')->nullOnInvalid(),
])
->tag('monolog.logger', ['channel' => 'security'])
->set('security.authentication.provider.dao', DaoAuthenticationProvider::class)
->abstract()
@ -244,22 +246,21 @@ return static function (ContainerConfigurator $container) {
->set('security.exception_listener', ExceptionListener::class)
->abstract()
->tag('monolog.logger', ['channel' => 'security'])
->args([
service('security.token_storage'),
service('security.authentication.trust_resolver'),
service('security.http_utils'),
abstract_arg(''),
abstract_arg('Provider-shared Key'),
service('security.authentication.entry_point')->nullOnInvalid(),
param('security.access.denied_url'),
service('security.access.denied_handler')->nullOnInvalid(),
service('logger')->nullOnInvalid(),
false, // Stateless
])
->tag('monolog.logger', ['channel' => 'security'])
->set('security.authentication.switchuser_listener', SwitchUserListener::class)
->abstract()
->tag('monolog.logger', ['channel' => 'security'])
->args([
service('security.token_storage'),
abstract_arg('User Provider'),
@ -267,19 +268,20 @@ return static function (ContainerConfigurator $container) {
abstract_arg('Provider Key'),
service('security.access.decision_manager'),
service('logger')->nullOnInvalid(),
abstract_arg('_switch_user'),
abstract_arg('ROLE_ALLOWED_TO_SWITCH'),
'_switch_user',
'ROLE_ALLOWED_TO_SWITCH',
service('event_dispatcher')->nullOnInvalid(),
false, // Stateless
])
->tag('monolog.logger', ['channel' => 'security'])
->set('security.access_listener', AccessListener::class)
->tag('monolog.logger', ['channel' => 'security'])
->args([
service('security.token_storage'),
service('security.access.decision_manager'),
service('security.access_map'),
service('security.authentication.manager'),
])
->args([
service('security.token_storage'),
service('security.access.decision_manager'),
service('security.access_map'),
service('security.authentication.manager'),
])
->tag('monolog.logger', ['channel' => 'security'])
;
};

7
src/Symfony/Bundle/SecurityBundle/Resources/config/security_rememberme.php
View File

@ -22,7 +22,6 @@ return static function (ContainerConfigurator $container) {
$container->services()
->set('security.authentication.listener.rememberme', RememberMeListener::class)
->abstract()
->tag('monolog.logger', ['channel' => 'security'])
->args([
service('security.untracked_token_storage'),
service('security.authentication.rememberme'),
@ -32,6 +31,7 @@ return static function (ContainerConfigurator $container) {
abstract_arg('Catch exception flag set in RememberMeFactory'),
service('security.authentication.session_strategy'),
])
->tag('monolog.logger', ['channel' => 'security'])
->set('security.authentication.provider.rememberme', RememberMeAuthenticationProvider::class)
->abstract()
@ -41,7 +41,6 @@ return static function (ContainerConfigurator $container) {
->set('security.authentication.rememberme.services.abstract')
->abstract()
->tag('monolog.logger', ['channel' => 'security'])
->args([
[], // User Providers
abstract_arg('Shared Token Key'),
@ -49,6 +48,7 @@ return static function (ContainerConfigurator $container) {
[], // Options
service('logger')->nullOnInvalid(),
])
->tag('monolog.logger', ['channel' => 'security'])
->set('security.authentication.rememberme.services.persistent', PersistentTokenBasedRememberMeServices::class)
->parent('security.authentication.rememberme.services.abstract')
@ -58,6 +58,7 @@ return static function (ContainerConfigurator $container) {
->parent('security.authentication.rememberme.services.abstract')
->abstract()
->set('security.rememberme.response_listener', ResponseListener::class)->tag('kernel.event_subscriber')
->set('security.rememberme.response_listener', ResponseListener::class)
->tag('kernel.event_subscriber')
;
};