mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add feature to loop all groups for auth

Browse Source
This commit is contained in:
Tyler Christiansen
2015-04-07 11:48:29 -07:00
parent aca531bfab
commit 00f77f8bdf
1 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
html/includes/authentication/ldap.inc.php
View File

@@ -15,7 +15,7 @@ if ($config['auth_ldap_starttls'] && ($config['auth_ldap_starttls'] == 'optional
function authenticate($username,$password) function authenticate($username,$password)
{ {
global $config, $ds; global $config, $ds;
if ($username && $ds) if ($username && $ds)
{ {
if ($config['auth_ldap_version']) if ($config['auth_ldap_version'])
@@ -30,9 +30,12 @@ function authenticate($username,$password)
} }
else else
{ {
if (ldap_compare($ds,$config['auth_ldap_group'], $config['auth_ldap_groupmemberattr'],get_membername($username))===true) $ldap_groups = get_group_list();
{ foreach($ldap_groups as $ldap_group) {
return 1; if (ldap_compare($ds,$ldap_group, $config['auth_ldap_groupmemberattr'],get_membername($username))===true)
{
return 1;
}
} }
} }
} }
@@ -153,10 +156,12 @@ function get_userlist()
$username = $entry['uid'][0]; $username = $entry['uid'][0];
$realname = $entry['cn'][0]; $realname = $entry['cn'][0];
$user_id = $entry['uidnumber'][0]; $user_id = $entry['uidnumber'][0];
$ldap_groups = get_group_list();
if (!isset($config['auth_ldap_group']) || ldap_compare($ds,$config['auth_ldap_group'],$config['auth_ldap_groupmemberattr'],get_membername($username))===true) foreach($ldap_groups as $ldap_group) {
{ 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);
}
} }
} }
} }
@@ -196,4 +201,14 @@ function get_membername ($username)
return $membername; return $membername;
} }
function get_group_list() {
$ldap_groups = [];
$ldap_groups[] = $config['auth_ldap_groupbase'];
foreach($config['auth_ldap_groups'] as $key => $value) {
$dn = "cn=$key," . $config['auth_ldap_groupbase'];
$ldap_groups[] = $dn;
}
return $ldap_groups;
}
?> ?>