[Ldap] Add exception for mapping ldap errors

Simperfit · Simperfit · commit 792fdb40cbc9 · 2019-05-20T15:52:19.000+02:00
diff --git a/src/Symfony/Component/Ldap/Adapter/ExtLdap/Connection.php b/src/Symfony/Component/Ldap/Adapter/ExtLdap/Connection.php
@@ -12,7 +12,10 @@
 namespace Symfony\Component\Ldap\Adapter\ExtLdap;
 
 use Symfony\Component\Ldap\Adapter\AbstractConnection;
+use Symfony\Component\Ldap\Exception\AlreadyExistsException;
 use Symfony\Component\Ldap\Exception\ConnectionException;
+use Symfony\Component\Ldap\Exception\ConnectionTimeoutException;
+use Symfony\Component\Ldap\Exception\InvalidCredentialsException;
 use Symfony\Component\Ldap\Exception\LdapException;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -22,6 +25,10 @@
  */
 class Connection extends AbstractConnection
 {
+    private const LDAP_INVALID_CREDENTIALS = '0x31';
+    private const LDAP_TIMEOUT = '0x55';
+    private const LDAP_ALREADY_EXISTS = '0x44';
+
     /** @var bool */
     private $bound = false;
 
@@ -51,7 +58,16 @@ public function bind($dn = null, $password = null)
         }
 
         if (false === @ldap_bind($this->connection, $dn, $password)) {
-            throw new ConnectionException(ldap_error($this->connection));
+            $error = ldap_error($this->connection);
+            switch (ldap_errno($this->connection)) {
+                case self::LDAP_INVALID_CREDENTIALS:
+                    throw new InvalidCredentialsException($error);
+                case self::LDAP_TIMEOUT:
+                    throw new ConnectionTimeoutException($error);
+                case self::LDAP_ALREADY_EXISTS:
+                    throw new AlreadyExistsException($error);
+            }
+            throw new ConnectionException($error);
         }
 
         $this->bound = true;
diff --git a/src/Symfony/Component/Ldap/Exception/AlreadyExistsException.php b/src/Symfony/Component/Ldap/Exception/AlreadyExistsException.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Ldap\Exception;
+
+/**
+ * ConnectionException is throw if binding to ldap can not be established.
+ *
+ * @author Hamza Amrouche <hamza.simperfit@gmail.com>
+ */
+class AlreadyExistsException extends ConnectionException implements ExceptionInterface
+{
+}
diff --git a/src/Symfony/Component/Ldap/Exception/ConnectionTimeoutException.php b/src/Symfony/Component/Ldap/Exception/ConnectionTimeoutException.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Ldap\Exception;
+
+/**
+ * ConnectionException is throw if binding to ldap can not be established.
+ *
+ * @author Hamza Amrouche <hamza.simperfit@gmail.com>
+ */
+class ConnectionTimeoutException extends ConnectionException implements ExceptionInterface
+{
+}
diff --git a/src/Symfony/Component/Ldap/Exception/InvalidCredentialsException.php b/src/Symfony/Component/Ldap/Exception/InvalidCredentialsException.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Ldap\Exception;
+
+/**
+ * ConnectionException is throw if binding to ldap can not be established.
+ *
+ * @author Hamza Amrouche <hamza.simperfit@gmail.com>
+ */
+class InvalidCredentialsException extends ConnectionException implements ExceptionInterface
+{
+}
diff --git a/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/LdapManagerTest.php b/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/LdapManagerTest.php
@@ -15,6 +15,7 @@
 use Symfony\Component\Ldap\Adapter\ExtLdap\Collection;
 use Symfony\Component\Ldap\Adapter\ExtLdap\UpdateOperation;
 use Symfony\Component\Ldap\Entry;
+use Symfony\Component\Ldap\Exception\AlreadyExistsException;
 use Symfony\Component\Ldap\Exception\LdapException;
 use Symfony\Component\Ldap\Exception\NotBoundException;
 use Symfony\Component\Ldap\Exception\UpdateOperationException;
@@ -75,6 +76,26 @@ public function testLdapAddInvalidEntry()
         $em->add($entry);
     }
 
+    /**
+     * @group functional
+     */
+    public function testLdapAddDouble()
+    {
+        $this->expectException(AlreadyExistsException::class);
+        $this->executeSearchQuery(1);
+
+        $entry = new Entry('cn=Elsa Amrouche,dc=symfony,dc=com', [
+            'sn' => ['eamrouche'],
+            'objectclass' => [
+                'inetOrgPerson',
+            ],
+        ]);
+
+        $em = $this->adapter->getEntryManager();
+        $em->add($entry);
+        $em->add($entry);
+    }
+
     /**
      * @group functional
      */
