Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix LDAP module #366

Merged
merged 1 commit into from
Oct 14, 2019
Merged

fix LDAP module #366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@
define ('LDAP_BIND_DN', 'cn=read-only-admin,dc=example,dc=com');
define ('LDAP_BIND_PASSWORD', 'password');

define ('LDAP_ACCOUNT', '{$username}'); // '{$username}' cannot be changed, else can
define ('LDAP_ACCOUNT', 'cn={$username},dc=example,dc=com'); // '{$username}' cannot be changed, else can

define ('LDAP_ATTRIBUTE_UID', 'uid');
define ('LDAP_ATTRIBUTE_DN', 'dn');
Expand All @@ -281,6 +281,7 @@
define ('LDAP_ATTRIBUTE_EMAIL', 'mail');

define ('LDAP_SITEID', 1);
define ('LDAP_AD', false); // use for AD and Samba LDAP servers


/* Job Types mapping
Expand Down
47 changes: 29 additions & 18 deletions lib/LDAP.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ static function getInstance()
{
self::$_instance = new LDAP();
}
if (!self::$_instance->_connection) {
if (!self::$_instance->_connection) {
self::$_instance->connect();
}
if (!self::$_instance->_connection) {
return NULL;
}
if (!self::$_instance->_connection) {
return NULL;
}
return self::$_instance;
}

Expand All @@ -40,9 +40,14 @@ public function connect()
$this->_connection = @ldap_connect(LDAP_HOST, LDAP_PORT);
if (!$this->_connection)
{
error_log("Could not connect to LDAP server");
return false;
}
@ldap_set_option($this->_connection, LDAP_OPT_PROTOCOL_VERSION, LDAP_PROTOCOL_VERSION);
if (LDAP_AD)
{
@ldap_set_option($this->_connection, LDAP_OPT_REFERRALS, 0);
}
return true;
}

Expand All @@ -55,36 +60,44 @@ public function authenticate($username, $password)
$this->_bind = @ldap_bind($this->_connection, LDAP_BIND_DN, LDAP_BIND_PASSWORD);
if(!$this->_bind)
{
error_log(ldap_error($this->_connection));
$this->_bind = NULL;
return false;
}

$search = @ldap_search( $this->_connection, LDAP_BASEDN, '('.LDAP_ATTRIBUTE_UID . '=' . $username.')');
$search = @ldap_search( $this->_connection, LDAP_BASEDN, LDAP_ATTRIBUTE_UID . '=' . $username);
if (!$search)
{
error_log(ldap_error($this->_connection));
return false;
}

$result = @ldap_get_entries( $this->_connection, $search);
if ($result[0])
{
if (ldap_bind( $this->_connection, $result[0][LDAP_ATTRIBUTE_DN][0], $password) )
if (ldap_bind( $this->_connection, $result[0][LDAP_ATTRIBUTE_DN], $password) )
{
return true;
}
else
{
error_log(ldap_error($this->_connection));
return false;
}
}
else
{
error_log("No user with attribute " . LDAP_ATTRIBUTE_UID . "=" . $username);
}
}
else
{
$trans = array('{$username}' => $username);
$username = strtr(LDAP_ACCOUNT, $trans);
$trans = array('{$username}' => $username);
$username = strtr(LDAP_ACCOUNT, $trans);
$this->_bind = @ldap_bind($this->_connection, $username, $password);
if(!$this->_bind)
{
error_log(ldap_error($this->_connection));
$this->_bind = NULL;
return false;
}
Expand All @@ -111,20 +124,18 @@ public function searchUid($username)
}
}

public function getUserInfo($username)
{
$search = @ldap_search( $this->_connection,
LDAP_BASEDN, LDAP_ATTRIBUTE_UID . '=' . $username);
public function getUserInfo($username)
{
$search = @ldap_search( $this->_connection, LDAP_BASEDN, LDAP_ATTRIBUTE_UID . '=' . $username);

if ($search)
if ($search)
{
$result = @ldap_get_entries( $this->_connection, $search);
$userInfo = array($result[0][LDAP_ATTRIBUTE_LASTNAME][0], $result[0][LDAP_ATTRIBUTE_FIRSTNAME][0], $result[0][LDAP_ATTRIBUTE_EMAIL][0], $result[0][LDAP_ATTRIBUTE_UID][0]);
return $userInfo;
return $userInfo;
}

return NULL;

}
error_log(ldap_error($this->_connection));
return NULL;
}
}
?>