Fix LDAP connection options

buffcode · buffcode · commit 13787da091ff · 2022-05-12T09:00:45.000+02:00
diff --git a/src/Symfony/Component/Ldap/Adapter/ExtLdap/Connection.php b/src/Symfony/Component/Ldap/Adapter/ExtLdap/Connection.php
@@ -147,12 +147,21 @@ private function connect()
             return;
         }
 
+        foreach ($this->config['options'] as $name => $value) {
+            if (ConnectionOptions::isPreconnectOption($name)) {
+                $this->setOption($name, $value);
+            }
+        }
+
         $this->connection = ldap_connect($this->config['connection_string']);
 
         foreach ($this->config['options'] as $name => $value) {
-            $this->setOption($name, $value);
+            if (!ConnectionOptions::isPreconnectOption($name)) {
+                $this->setOption($name, $value);
+            }
         }
 
+
         if (false === $this->connection) {
             throw new LdapException('Could not connect to Ldap server: '.ldap_error($this->connection));
         }
diff --git a/src/Symfony/Component/Ldap/Adapter/ExtLdap/ConnectionOptions.php b/src/Symfony/Component/Ldap/Adapter/ExtLdap/ConnectionOptions.php
@@ -40,6 +40,7 @@ final class ConnectionOptions
     public const DEBUG_LEVEL = 0x5001;
     public const TIMEOUT = 0x5002;
     public const NETWORK_TIMEOUT = 0x5005;
+    public const X_TLS_CACERTFILE = 0x6002;
     public const X_TLS_CACERTDIR = 0x6003;
     public const X_TLS_CERTFILE = 0x6004;
     public const X_TLS_CRL_ALL = 0x02;
@@ -62,6 +63,13 @@ final class ConnectionOptions
     public const X_KEEPALIVE_PROBES = 0x6301;
     public const X_KEEPALIVE_INTERVAL = 0x6302;
 
+    private const PRECONNECT_OPTIONS = [
+        self::DEBUG_LEVEL,
+        self::X_TLS_CACERTDIR,
+        self::X_TLS_CACERTFILE,
+        self::X_TLS_REQUIRE_CERT,
+    ];
+
     public static function getOptionName(string $name): string
     {
         return sprintf('%s::%s', self::class, strtoupper($name));
@@ -89,4 +97,9 @@ public static function isOption(string $name): bool
     {
         return \defined(self::getOptionName($name));
     }
+
+    public static function isPreconnectOption(string $name): bool
+    {
+        return \in_array(self::getOption($name), self::PRECONNECT_OPTIONS, true);
+    }
 }
