bug #47547 [Ldap] Do not run ldap_set_option on failed connection (tatankat)

nicolas-grekas · nicolas-grekas · commit 99e973367541 · 2022-09-28T15:02:13.000+02:00
This PR was squashed before being merged into the 4.4 branch. Discussion ---------- [Ldap] Do not run ldap_set_option on failed connection | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no  | Deprecations? | no  | License | MIT ldap_set_option should only be called on null (first time setOption is run) or on an LDAP\Connection instance. When ldap_connect fails, it returns a boolean. ldap_set_option fails on this, which results in an early TypeError instead of the LdapException with the real issue: 'Could not connect to Ldap server'. So, the result of ldap_connect should be checked earlier. Commits ------- 8f4f2b1 [Ldap] Do not run ldap_set_option on failed connection
diff --git a/src/Symfony/Component/Ldap/Adapter/ExtLdap/Connection.php b/src/Symfony/Component/Ldap/Adapter/ExtLdap/Connection.php
@@ -159,18 +159,18 @@ private function connect()
             }
         }
 
-        $this->connection = ldap_connect($this->config['connection_string']);
+        if (false === $connection = ldap_connect($this->config['connection_string'])) {
+            throw new LdapException('Invalid connection string: '.$this->config['connection_string']);
+        } else {
+            $this->connection = $connection;
+        }
 
         foreach ($this->config['options'] as $name => $value) {
             if (!\in_array(ConnectionOptions::getOption($name), self::PRECONNECT_OPTIONS, true)) {
                 $this->setOption($name, $value);
             }
         }
 
-        if (false === $this->connection) {
-            throw new LdapException('Could not connect to Ldap server: '.ldap_error($this->connection));
-        }
-
         if ('tls' === $this->config['encryption'] && false === @ldap_start_tls($this->connection)) {
             throw new LdapException('Could not initiate TLS connection: '.ldap_error($this->connection));
         }

Original file line number	Diff line number	Diff line change
`@@ -159,18 +159,18 @@ private function connect()`
`159`	`159`	`}`
`160`	`160`	`}`
`161`	`161`
`162`		`- $this->connection = ldap_connect($this->config['connection_string']);`
	`162`	`+ if (false === $connection = ldap_connect($this->config['connection_string'])) {`
	`163`	`+ throw new LdapException('Invalid connection string: '.$this->config['connection_string']);`
	`164`	`+ } else {`
	`165`	`+ $this->connection = $connection;`
	`166`	`+ }`
`163`	`167`
`164`	`168`	`foreach ($this->config['options'] as $name => $value) {`
`165`	`169`	`if (!\in_array(ConnectionOptions::getOption($name), self::PRECONNECT_OPTIONS, true)) {`
`166`	`170`	`$this->setOption($name, $value);`
`167`	`171`	`}`
`168`	`172`	`}`
`169`	`173`
`170`		`- if (false === $this->connection) {`
`171`		`- throw new LdapException('Could not connect to Ldap server: '.ldap_error($this->connection));`
`172`		`- }`
`173`		`-`
`174`	`174`	`if ('tls' === $this->config['encryption'] && false === @ldap_start_tls($this->connection)) {`
`175`	`175`	`throw new LdapException('Could not initiate TLS connection: '.ldap_error($this->connection));`
`176`	`176`	`}`