tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Throw Ldap\Exception when something goes wrong in a Ldap connection

This commit is contained in:
Matthias Jentsch 2014-06-25 12:38:31 +02:00
parent e7548b6fc7
commit c18b6f26f0
2 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/Icinga/Authentication/Backend/LdapUserBackend.php
View File

@ -29,11 +29,11 @@
namespace Icinga\Authentication\Backend;
use \Exception;
use Icinga\User;
use Icinga\Authentication\UserBackend;
use Icinga\Protocol\Ldap\Connection;
use Icinga\Exception\AuthenticationException;
use Icinga\Protocol\Ldap\Exception as LdapException;
class LdapUserBackend extends UserBackend
{
@ -159,7 +159,7 @@ class LdapUserBackend extends UserBackend
$this->conn->fetchDN($this->createQuery($user->getUsername())),
$password
);
} catch (\Exception $e) {
} catch (LdapException $e) {
// Error during authentication of this specific user
throw new AuthenticationException(
sprintf(

43
library/Icinga/Protocol/Ldap/Connection.php
View File

@ -29,6 +29,7 @@
namespace Icinga\Protocol\Ldap;
use Icinga\Protocol\Ldap\Exception as LdapException;
use Icinga\Application\Platform;
use Icinga\Application\Config;
use Icinga\Logger\Logger;
@ -110,7 +111,7 @@ class Connection
*
* @var bool
*/
protected $bindDone = false;
protected $bound = false;
protected $root;
@ -179,7 +180,7 @@ class Connection
if (ldap_errno($this->ds) === self::LDAP_NO_SUCH_OBJECT) {
return false;
}
throw new \Exception(
throw new LdapException(
sprintf(
'LDAP list for "%s" failed: %s',
$dn,
@ -192,7 +193,7 @@ class Connection
$result = $this->deleteRecursively($children[$i]['dn']);
if (!$result) {
//return result code, if delete fails
throw new \Exception(sprintf('Recursively deleting "%s" failed', $dn));
throw new LdapException(sprintf('Recursively deleting "%s" failed', $dn));
}
}
return $this->deleteDN($dn);
@ -208,7 +209,7 @@ class Connection
if (ldap_errno($this->ds) === self::LDAP_NO_SUCH_OBJECT) {
return false;
}
throw new \Exception(
throw new LdapException(
sprintf(
'LDAP delete for "%s" failed: %s',
$dn,
@ -227,13 +228,13 @@ class Connection
* @param array $fields The fields to fetch
*
* @return string Returns the distinguished name, or false when the given query yields no results
* @throws \Exception When the query result is empty and contains no DN to fetch
* @throws LdapException When the query result is empty and contains no DN to fetch
*/
public function fetchDN($query, $fields = array())
{
$rows = $this->fetchAll($query, $fields);
if (count($rows) !== 1) {
throw new \Exception(
throw new LdapException(
sprintf(
'Cannot fetch single DN for %s',
$query
@ -340,7 +341,7 @@ class Connection
if (ldap_errno($this->ds) === self::LDAP_NO_SUCH_OBJECT) {
return false;
}
throw new \Exception(
throw new LdapException(
sprintf(
'LDAP query "%s" (root %s) failed: %s',
$query,
@ -399,7 +400,7 @@ class Connection
* Connect to the given ldap server and apply settings depending on the discovered capabilities
*
* @return resource A positive LDAP link identifier
* @throws \Exception When the connection is not possible
* @throws LdapException When the connection is not possible
*/
protected function prepareNewConnection()
{
@ -422,7 +423,7 @@ class Connection
Logger::debug('LDAP STARTTLS succeeded');
} else {
Logger::debug('LDAP STARTTLS failed: %s', ldap_error($ds));
throw new \Exception(
throw new LdapException(
sprintf(
'LDAP STARTTLS failed: %s',
ldap_error($ds)
@ -430,7 +431,7 @@ class Connection
);
}
} elseif ($force_tls) {
throw new \Exception(
throw new LdapException(
sprintf(
'TLS is required but not announced by %s',
$this->host_name
@ -443,7 +444,7 @@ class Connection
// ldap_rename requires LDAPv3:
if ($cap->supports_ldapv3) {
if (! ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3)) {
throw new \Exception('LDAPv3 is required');
throw new LdapException('LDAPv3 is required');
}
} else {
@ -473,7 +474,7 @@ class Connection
}
putenv('LDAPRC=' . $ldap_conf);
if (getenv('LDAPRC') !== $ldap_conf) {
throw new \Exception('putenv failed');
throw new LdapException('putenv failed');
}
}
}
@ -620,7 +621,7 @@ class Connection
* @param resource $ds The link identifier of the current ldap connection
*
* @return array The capabilities and naming-contexts
* @throws \Exception When the capability query fails
* @throws LdapException When the capability query fails
*/
protected function discoverCapabilities($ds)
{
@ -648,7 +649,7 @@ class Connection
);
if (! $result) {
throw new \Exception(
throw new LdapException(
sprintf(
'Capability query failed (%s:%d): %s',
$this->hostname,
@ -681,7 +682,7 @@ class Connection
/**
* Try to connect to the given ldap server
*
* @throws \Exception When connecting is not possible
* @throws LdapException When connecting is not possible
*/
public function connect()
{
@ -694,17 +695,17 @@ class Connection
/**
* Try to bind to the current ldap domain using the provided bind_dn and bind_pw
*
* @throws \Exception When binding is not possible
* @throws LdapException When binding is not possible
*/
public function bind()
{
if ($this->bindDone) {
if ($this->bound) {
return;
}
$r = @ldap_bind($this->ds, $this->bind_dn, $this->bind_pw);
if (! $r) {
throw new \Exception(
throw new LdapException(
sprintf(
'LDAP connection to %s:%s (%s / %s) failed: %s',
$this->hostname,
@ -715,7 +716,7 @@ class Connection
)
);
}
$this->bindDone = true;
$this->bound = true;
}
/**
@ -750,7 +751,7 @@ class Connection
* @param string $dn DN of the object
* @param string $newRdn Relative DN identifier
* @param string $newParentDn Parent or superior entry
* @throws \Exception Thrown then rename failed
* @throws LdapException Thrown then rename failed
*
* @return bool True on success
*/
@ -759,7 +760,7 @@ class Connection
$returnValue = ldap_rename($this->ds, $dn, $newRdn, $newParentDn, false);
if ($returnValue === false) {
throw new \Exception('Could not move entry: ' . ldap_error($this->ds));
throw new LdapException('Could not move entry: ' . ldap_error($this->ds));
}
return $returnValue;