From 30baf8228efb52c282976ff160dc57cefcefa714 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Fri, 12 Jan 2024 17:51:01 +0100 Subject: [PATCH] fix(ldap): replace {username} with {user_identifier} in LDAP factories In SF 7.0, the deprecated {username} placeholder was removed in favor of {user_identifier} (in #50866). However, the default values for the filter and dn_string parameters still contained {username} instead of the updated key. This PR changes the value to the new updated key Signed-off-by: Thomas Citharel --- .../Security/Factory/FormLoginLdapFactory.php | 2 +- .../Security/Factory/HttpBasicLdapFactory.php | 2 +- .../Security/Factory/JsonLoginLdapFactory.php | 2 +- .../DependencyInjection/Security/UserProvider/LdapFactory.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FormLoginLdapFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FormLoginLdapFactory.php index 705d079c5d73e..53a778c70afa5 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FormLoginLdapFactory.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FormLoginLdapFactory.php @@ -32,7 +32,7 @@ public function addConfiguration(NodeDefinition $node): void $node ->children() ->scalarNode('service')->defaultValue('ldap')->end() - ->scalarNode('dn_string')->defaultValue('{username}')->end() + ->scalarNode('dn_string')->defaultValue('{user_identifier}')->end() ->scalarNode('query_string')->end() ->scalarNode('search_dn')->defaultValue('')->end() ->scalarNode('search_password')->defaultValue('')->end() diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicLdapFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicLdapFactory.php index 3d7946115c433..2889b6f7ebc73 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicLdapFactory.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicLdapFactory.php @@ -77,7 +77,7 @@ public function addConfiguration(NodeDefinition $node): void $node ->children() ->scalarNode('service')->defaultValue('ldap')->end() - ->scalarNode('dn_string')->defaultValue('{username}')->end() + ->scalarNode('dn_string')->defaultValue('{user_identifier}')->end() ->scalarNode('query_string')->end() ->scalarNode('search_dn')->defaultValue('')->end() ->scalarNode('search_password')->defaultValue('')->end() diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/JsonLoginLdapFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/JsonLoginLdapFactory.php index 61266854c8f5e..7e0ceb6bf3ce6 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/JsonLoginLdapFactory.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/JsonLoginLdapFactory.php @@ -29,7 +29,7 @@ public function addConfiguration(NodeDefinition $node): void $node ->children() ->scalarNode('service')->defaultValue('ldap')->end() - ->scalarNode('dn_string')->defaultValue('{username}')->end() + ->scalarNode('dn_string')->defaultValue('{user_identifier}')->end() ->scalarNode('query_string')->end() ->scalarNode('search_dn')->defaultValue('')->end() ->scalarNode('search_password')->defaultValue('')->end() diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php index a719b3f0d955e..b8d442fd99251 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php @@ -64,7 +64,7 @@ public function addConfiguration(NodeDefinition $node): void ->prototype('scalar')->end() ->end() ->scalarNode('uid_key')->defaultValue('sAMAccountName')->end() - ->scalarNode('filter')->defaultValue('({uid_key}={username})')->end() + ->scalarNode('filter')->defaultValue('({uid_key}={user_identifier})')->end() ->scalarNode('password_attribute')->defaultNull()->end() ->end() ;