Skip to content

LDAP nested groups patch (Copied from GeoffMaciolek:tkr-ldap-recurse pull #147) #156

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

Open
bpothier wants to merge 1 commit into
base: maintenance-0.20.x
Choose a base branch
from
Open

LDAP nested groups patch (Copied from GeoffMaciolek:tkr-ldap-recurse pull #147) #156

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
43 changes: 43 additions & 0 deletions wwwroot/inc/auth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,12 +624,55 @@ function queryLDAPServer ($username, $password)
preg_match ($LDAP_options['group_filter'], $info[0][$LDAP_options['group_attr']][$i], $matches) &&
validTagName ('$lgcn_' . $matches[1], TRUE)
)
{
$ret['memberof'][] = '$lgcn_' . $matches[1];
nested_groups ($ret, $matches[1], $connect); // This function will perform nested search
}
}
@ldap_close ($connect);
return $ret;
}

// This is the newly added function, which will perform a recursive search
// through all the nested group memberships of the user account requested.
// This is possible because of the recursive call at the end of this function.
function nested_groups (&$ret, $match, $connection)
{
global $LDAP_options;

$results = @ldap_search
(
$connection,
$LDAP_options['search_dn'],
'(' . $LDAP_options['search_attr'] . "=${match})",
array_merge (array ($LDAP_options['group_attr']), explode (' ', $LDAP_options['displayname_attrs']))
);
if (@ldap_count_entries ($connection, $results) != 1)
{
return false; // If the group isn't found, exit function
}
$info = @ldap_get_entries ($connection, $results);
ldap_free_result ($results);
$space = '';
foreach (explode (' ', $LDAP_options['displayname_attrs']) as $attr)
{
$ret['displayed_name'] .= $space . $info[0][$attr][0];
$space = ' ';
}
// Pull group membership, if any was returned.
if (isset ($info[0][$LDAP_options['group_attr']]))
for ($i = 0; $i < $info[0][$LDAP_options['group_attr']]['count']; $i++)
if
(
preg_match ($LDAP_options['group_filter'], $info[0][$LDAP_options['group_attr']][$i], $matches)
and validTagName ('$lgcn_' . $matches[1], TRUE)
)
{
$ret['memberof'][] = '$lgcn_' . $matches[1];
nested_groups ($ret, $matches[1], $connection); // Recursive call
}
}

function authenticated_via_database ($userinfo, $password)
{
if (!isset ($userinfo['user_id'])) // not a local account
Expand Down