AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Split LDAP findUser() method into smaller functions

Browse Source
This commit is contained in:
Frédéric Guillot
2014-09-12 18:30:31 +02:00
parent 63430d5735
commit 22c51e3ca4
1 changed files with 67 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
app/Auth/Ldap.php
View File

@@ -68,6 +68,28 @@ class Ldap extends Base
return false; return false;
} }
/**
* Create a new local user after the LDAP authentication
*
* @access public
* @param string $username Username
* @param string $name Name of the user
* @param string $email Email address
* @return bool
*/
public function createUser($username, $name, $email)
{
$values = array(
'username' => $username,
'name' => $name,
'email' => $email,
'is_admin' => 0,
'is_ldap_user' => 1,
);
return $this->user->create($values);
}
/** /**
* Find the user from the LDAP server * Find the user from the LDAP server
* *
@@ -77,6 +99,23 @@ class Ldap extends Base
* @return boolean|array * @return boolean|array
*/ */
public function findUser($username, $password) public function findUser($username, $password)
{
$ldap = $this->connect();
if ($this->bind($ldap, $username, $password)) {
return $this->search($ldap, $username, $password);
}
return false;
}
/**
* LDAP connection
*
* @access private
* @return resource $ldap LDAP connection
*/
private function connect()
{ {
if (! function_exists('ldap_connect')) { if (! function_exists('ldap_connect')) {
die('The PHP LDAP extension is required'); die('The PHP LDAP extension is required');
@@ -96,6 +135,20 @@ class Ldap extends Base
ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, 3); ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, 3);
ldap_set_option($ldap, LDAP_OPT_REFERRALS, 0); ldap_set_option($ldap, LDAP_OPT_REFERRALS, 0);
return $ldap;
}
/**
* LDAP bind
*
* @access private
* @param resource $ldap LDAP connection
* @param string $username Username
* @param string $password Password
* @return boolean
*/
private function bind($ldap, $username, $password)
{
if (LDAP_BIND_TYPE === 'user') { if (LDAP_BIND_TYPE === 'user') {
$ldap_username = sprintf(LDAP_USERNAME, $username); $ldap_username = sprintf(LDAP_USERNAME, $username);
$ldap_password = $password; $ldap_password = $password;
@@ -113,6 +166,20 @@ class Ldap extends Base
return false; return false;
} }
return true;
}
/**
* LDAP user lookup
*
* @access private
* @param resource $ldap LDAP connection
* @param string $username Username
* @param string $password Password
* @return boolean|array
*/
private function search($ldap, $username, $password)
{
$sr = @ldap_search($ldap, LDAP_ACCOUNT_BASE, sprintf(LDAP_USER_PATTERN, $username), array(LDAP_ACCOUNT_FULLNAME, LDAP_ACCOUNT_EMAIL)); $sr = @ldap_search($ldap, LDAP_ACCOUNT_BASE, sprintf(LDAP_USER_PATTERN, $username), array(LDAP_ACCOUNT_FULLNAME, LDAP_ACCOUNT_EMAIL));
if ($sr === false) { if ($sr === false) {
@@ -138,26 +205,4 @@ class Ldap extends Base
return false; return false;
} }
/**
* Create a new local user after the LDAP authentication
*
* @access public
* @param string $username Username
* @param string $name Name of the user
* @param string $email Email address
* @return bool
*/
public function createUser($username, $name, $email)
{
$values = array(
'username' => $username,
'name' => $name,
'email' => $email,
'is_admin' => 0,
'is_ldap_user' => 1,
);
return $this->user->create($values);
}
} }