Remove try catch block, Update README.md

Author: PhilVanB

README.md

@@ -41,14 +41,15 @@ firewalls:
   secured_area:
     pattern:    ^/
     anonymous: ~
-    provider: chain_provider
+    provider: main
     mapbender_ldap:
       login_path: /user/login
       check_path: /user/login/check
+      provider: ldapProvider
     form_login:
       check_path: /user/login/check
       login_path: /user/login
-      provider: main
+      csrf_token_generator: security.csrf.token_manager
     logout:
       path:   /user/logout
       target: /

Security/Provider/LDAPUserProvider.php

@@ -4,13 +4,13 @@
 namespace Mapbender\LDAPBundle\Security\Provider;
 
 use Mapbender\LDAPBundle\Component\LdapClient;
+use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface;
 use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
 use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Security\Core\User\UserProviderInterface;
 use Mapbender\LDAPBundle\Security\User\LDAPUser;
 
-
 /**
  * @author  David Patzke <david.patzke@wheregroup.com>
  */
@@ -31,14 +31,17 @@ class LDAPUserProvider implements UserProviderInterface
      * @param string $userQuery
      * @param string[] $defaultRoles
      */
-    public function __construct(LdapClient $ldapClient, LDAPGroupProvider $groupProvider,
-                                $userDN, $userQuery, Array $defaultRoles = ['ROLE_USER'])
+    public function __construct(LdapClient $ldapClient,
+                                LDAPGroupProvider $groupProvider,
+                                $userDN,
+                                $userQuery,
+                                Array $defaultRoles = ['ROLE_USER'])
     {
-        $this->ldapClient        = $ldapClient;
+        $this->ldapClient = $ldapClient;
         $this->groupProvider = $groupProvider;
-        $this->userDN            = $userDN;
-        $this->userQuery         = $userQuery;
-        $this->defaultRoles      = $defaultRoles;
+        $this->userDN = $userDN;
+        $this->userQuery = $userQuery;
+        $this->defaultRoles = $defaultRoles;
     }
 
     /**

Security/Provider/MapbenderLdapBindAuthenticationProvider.php

@@ -17,7 +17,7 @@
 use Symfony\Component\Security\Core\User\UserProviderInterface;
 use Symfony\Component\Security\Core\Authentication\Provider\LdapBindAuthenticationProvider;
 
-class MapbenderLdapBindAuthenticationProvider extends  LdapBindAuthenticationProvider
+class MapbenderLdapBindAuthenticationProvider extends LdapBindAuthenticationProvider
 {
     private $encoderFactory;
 
@@ -30,8 +30,7 @@ public function __construct(UserProviderInterface $userProvider,
                                 $userQuery,
                                 $searchDn, $searchPassword)
     {
-        parent::__construct( $userProvider,  $userChecker, $providerKey,  $ldap, $dnString, true, $searchDn, $searchPassword);
-
+        parent::__construct($userProvider, $userChecker, $providerKey, $ldap, $dnString, true, $searchDn, $searchPassword);
         $this->encoderFactory = $encoderFactory ;
 
         // support Mapbender < 3.2.x (Symfony 2.8)
@@ -40,28 +39,16 @@ public function __construct(UserProviderInterface $userProvider,
         }
     }
 
-
-
     /**
      * {@inheritdoc}
      */
     protected function checkAuthentication(UserInterface $user, UsernamePasswordToken $token)
     {
-
         $password = $token->getCredentials();
-        try{
+        try {
             parent::checkAuthentication($user, $token);
-        } catch(BadCredentialsException $e){
-
-            try {
-                if (!$this->encoderFactory->getEncoder($user)->isPasswordValid($user->getPassword(), $password, $user->getSalt())) {
-                    throw new BadCredentialsException('The presented password is invalid.');
-                }
-            } catch (\Exception $e){
-                throw new BadCredentialsException('The presented password is invalid.');
-            }
+        } catch (BadCredentialsException $e) {
+            throw new BadCredentialsException('The presented password is invalid: ' . $e->getMessage());
         }
     }
-
-
 }

Security/User/LDAPUser.php

@@ -7,21 +7,20 @@
  */
 
 namespace Mapbender\LDAPBundle\Security\User;
+
 use Symfony\Component\Security\Core\User\UserInterface;
 
 class LDAPUser implements UserInterface
 {
-
     protected $username;
     protected $roles;
 
-    public function __construct($username,Array $roles = ["ROLE_USER"])
+    public function __construct($username, Array $roles = ['ROLE_USER'])
     {
         $this->username = $username;
         $this->roles = $roles;
     }
 
-
     public function getRoles()
     {
         return $this->roles;
@@ -46,10 +45,11 @@ public function eraseCredentials()
     {
         return false;
     }
+
     /*
      * This is uses to create proper ACEs in Mapbender
-     * */
-    public function getClass(){
-        return "Mapbender\LDAPBundle\Security\User\LDAPUser";
+     */
+    public function getClass() {
+        return 'Mapbender\LDAPBundle\Security\User\LDAPUser';
     }
 }