use normal Pimcore login when LDAP connection is not available

BlackbitDigitalCommerce · Jun 30, 2020 · 62ebc95 · 62ebc95
1 parent 576e184
commit 62ebc95
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 15 deletions.
diff --git a/src/EventListener/LoginListener.php b/src/EventListener/LoginListener.php
@@ -17,21 +17,24 @@
 use Alep\LdapBundle\Service\Ldap;
 use Pimcore\Event\Admin\Login\LoginCredentialsEvent;
 use Pimcore\Event\Admin\Login\LoginFailedEvent;
+use Psr\Log\LoggerInterface;
 
 class LoginListener
 {
-    /**
-     * @var Ldap
-     */
+    /** @var Ldap */
     private $ldap;
 
+    /** @var LoggerInterface */
+    private $logger;
+
     /**
      * LoginListener constructor.
      * @param Ldap $ldap
      */
-    public function __construct(Ldap $ldap)
+    public function __construct(Ldap $ldap, LoggerInterface $logger)
     {
         $this->ldap = $ldap;
+        $this->logger = $logger;
     }
 
     /**
@@ -55,11 +58,16 @@ public function onAdminLoginCredentials(LoginCredentialsEvent $event)
             return;
         }
 
-        //Authenticate via ldap
-        $ldapUser = $this->ldap->authenticate($username, $password);
+        try {
+            //Authenticate via ldap
+            $ldapUser = $this->ldap->authenticate($username, $password);
 
-        //Update Pimcore user
-        $this->ldap->updatePimcoreUser($username, $password, $ldapUser);
+            //Update Pimcore user
+            $this->ldap->updatePimcoreUser($username, $password, $ldapUser);
+        } catch (\Exception $e) {
+            $this->logger->warning($e->getMessage());
+            return;
+        }
     }
 
     /**
@@ -76,13 +84,18 @@ public function onAdminLoginFailed(LoginFailedEvent $event)
             return;
         }
 
-        //authenticate via ldap
-        $ldapUser = $this->ldap->authenticate($username, $password);
+        try {
+            //authenticate via ldap
+            $ldapUser = $this->ldap->authenticate($username, $password);
 
-        //Update Pimcore user
-        $pimcoreUser = $this->ldap->updatePimcoreUser($username, $password, $ldapUser);
+            //Update Pimcore user
+            $pimcoreUser = $this->ldap->updatePimcoreUser($username, $password, $ldapUser);
 
-        //Update session
-        $event->setUser($pimcoreUser);
+            //Update session
+            $event->setUser($pimcoreUser);
+        } catch (\Exception $e) {
+            $this->logger->warning($e->getMessage());
+            return;
+        }
     }
 }
diff --git a/src/Service/Ldap.php b/src/Service/Ldap.php
@@ -104,7 +104,11 @@ public function __construct(
         $this->mapper = $mapper;
         $this->logger = $logger;
 
-        $this->ldap->bind($searchDn, $searchPassword);
+        try {
+            $this->ldap->bind($searchDn, $searchPassword);
+        } catch(ConnectionException $e) {
+            $this->logger->alert('Invalid LDAP credentials');
+        }
     }
 
     /**