added LdapQueryAuthenticationProvider

lsmith77 · lsmith77 · commit d7b193963eae · 2017-01-25T13:40:43.000+01:00
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FormLoginLdapFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FormLoginLdapFactory.php
@@ -26,15 +26,33 @@ class FormLoginLdapFactory extends FormLoginFactory
 {
     protected function createAuthProvider(ContainerBuilder $container, $id, $config, $userProviderId)
     {
-        $provider = 'security.authentication.provider.ldap_bind.'.$id;
-        $container
-            ->setDefinition($provider, new ChildDefinition('security.authentication.provider.ldap_bind'))
-            ->replaceArgument(0, new Reference($userProviderId))
-            ->replaceArgument(1, new Reference('security.user_checker.'.$id))
-            ->replaceArgument(2, $id)
-            ->replaceArgument(3, new Reference($config['service']))
-            ->replaceArgument(4, $config['dn_string'])
-        ;
+        $method = empty($config['query_string']) ? 'bind' : 'query';
+        
+        $provider = 'security.authentication.provider.ldap_'.$method.'.'.$id;
+
+        switch($method) {
+        case 'query':
+            $container
+                ->setDefinition($provider, new ChildDefinition('security.authentication.provider.ldap_query'))
+                ->replaceArgument(0, new Reference($userProviderId))
+                ->replaceArgument(1, new Reference('security.user_checker.'.$id))
+                ->replaceArgument(2, $id)
+                ->replaceArgument(3, new Reference($config['service']))
+                ->replaceArgument(4, $config['dn_string'])
+                ->replaceArgument(5, $config['query_string'])
+            ;
+            break;
+        default:
+            $container
+                ->setDefinition($provider, new ChildDefinition('security.authentication.provider.ldap_bind'))
+                ->replaceArgument(0, new Reference($userProviderId))
+                ->replaceArgument(1, new Reference('security.user_checker.'.$id))
+                ->replaceArgument(2, $id)
+                ->replaceArgument(3, new Reference($config['service']))
+                ->replaceArgument(4, $config['dn_string'])
+            ;
+            break;
+        }
 
         return $provider;
     }
@@ -47,6 +65,7 @@ public function addConfiguration(NodeDefinition $node)
             ->children()
                 ->scalarNode('service')->defaultValue('ldap')->end()
                 ->scalarNode('dn_string')->defaultValue('{username}')->end()
+                ->scalarNode('query_string')->end()
             ->end()
         ;
     }
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml
@@ -201,6 +201,16 @@
             <argument>%security.authentication.hide_user_not_found%</argument>
         </service>
 
+        <service id="security.authentication.provider.ldap_query" class="Symfony\Component\Security\Core\Authentication\Provider\LdapQueryAuthenticationProvider" public="false" abstract="true">
+            <argument /> <!-- User Provider -->
+            <argument /> <!-- UserChecker -->
+            <argument /> <!-- Provider-shared Key -->
+            <argument /> <!-- LDAP -->
+            <argument /> <!-- Base DN -->
+            <argument /> <!-- Query DN -->
+            <argument>%security.authentication.hide_user_not_found%</argument>
+        </service>
+
         <service id="security.authentication.provider.simple" class="Symfony\Component\Security\Core\Authentication\Provider\SimpleAuthenticationProvider" abstract="true" public="false">
             <argument /> <!-- Simple Authenticator -->
             <argument /> <!-- User Provider -->
