nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-28 08:02:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #707 from Ultra2D/master

Browse Source 
Add support for LDAP directories using member ...
This commit is contained in:
Neil Lathwood
2015-04-02 12:24:37 +01:00
parent b0494dca9a 0ab454fefc
commit 49babf77b8
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/authentication/ldap.inc.php
+17 -3
View File
@@ -30,7 +30,7 @@ function authenticate($username,$password)
} }
else else
{ {
if (ldap_compare($ds,$config['auth_ldap_group'],'memberUid',$username)) if (ldap_compare($ds,$config['auth_ldap_group'], $config['auth_ldap_groupmemberattr'],get_membername($username))===true)
{ {
return 1; return 1;
} }
@@ -97,7 +97,7 @@ function get_userlevel($username)
$userlevel = 0; $userlevel = 0;
# Find all defined groups $username is in # Find all defined groups $username is in
$filter = "(&(|(cn=" . join(")(cn=", array_keys($config['auth_ldap_groups'])) . "))(memberUid=" . $username . "))"; $filter = "(&(|(cn=" . join(")(cn=", array_keys($config['auth_ldap_groups'])) . "))(". $config['auth_ldap_groupmemberattr']. "=" . get_membername($username) . "))";
$search = ldap_search($ds, $config['auth_ldap_groupbase'], $filter); $search = ldap_search($ds, $config['auth_ldap_groupbase'], $filter);
$entries = ldap_get_entries($ds, $search); $entries = ldap_get_entries($ds, $search);
@@ -154,7 +154,7 @@ function get_userlist()
$realname = $entry['cn'][0]; $realname = $entry['cn'][0];
$user_id = $entry['uidnumber'][0]; $user_id = $entry['uidnumber'][0];
if (!isset($config['auth_ldap_group']) || ldap_compare($ds,$config['auth_ldap_group'],'memberUid',$username)) if (!isset($config['auth_ldap_group']) || ldap_compare($ds,$config['auth_ldap_group'],$config['auth_ldap_groupmemberattr'],get_membername($username))===true)
{ {
$userlist[] = array('username' => $username, 'realname' => $realname, 'user_id' => $user_id); $userlist[] = array('username' => $username, 'realname' => $realname, 'user_id' => $user_id);
} }
@@ -182,4 +182,18 @@ function update_user($user_id,$realname,$level,$can_modify_passwd,$email)
return 0; return 0;
} }
function get_membername ($username)
{
global $config;
if ($config['auth_ldap_groupmembertype'] == "fulldn")
{
$membername = $config['auth_ldap_prefix'] . $username . $config['auth_ldap_suffix'];
}
else
{
$membername = $username;
}
return $membername;
}
?> ?>
includes/defaults.inc.php
+1
View File
@@ -416,6 +416,7 @@ $config['auth_ldap_groupbase'] = "ou=group,dc=example,dc=com";
$config['auth_ldap_groups']['admin']['level'] = 10; $config['auth_ldap_groups']['admin']['level'] = 10;
$config['auth_ldap_groups']['pfy']['level'] = 7; $config['auth_ldap_groups']['pfy']['level'] = 7;
$config['auth_ldap_groups']['support']['level'] = 1; $config['auth_ldap_groups']['support']['level'] = 1;
$config['auth_ldap_groupmemberattr'] = "memberUid";
// Sensors // Sensors