Skip to content

ADD support for search_filter, precedence over search_attr #268

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
ntavares wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ADD support for search_filter, precedence over search_attr #268

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
29 changes: 21 additions & 8 deletions wwwroot/inc/auth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,8 +548,10 @@ function queryLDAPServer ($username, $password)
(
isset ($LDAP_options['search_dn']) &&
$LDAP_options['search_dn'] != '' &&
isset ($LDAP_options['search_attr']) &&
$LDAP_options['search_attr'] != ''
((isset ($LDAP_options['search_filter']) &&
$LDAP_options['search_filter'] != '') ||
(isset ($LDAP_options['search_attr']) &&
$LDAP_options['search_attr'] != ''))
)
{
// If a search_bind_rdn is supplied, bind to that and use it to search.
Expand All @@ -573,7 +575,12 @@ function queryLDAPServer ($username, $password)
RackTablesError::MISCONFIGURED
);
}
$results = @ldap_search ($connect, $LDAP_options['search_dn'], '(' . $LDAP_options['search_attr'] . "=${username})", array("dn"));
// compatibility: if 'search_filter' exists, use that one instead, as 'search_attr' is very limiting.
if (isset ($LDAP_options['search_filter']))
$search_attrs = str_replace('%USERNAME%', $username, $LDAP_options['search_filter']);
else
$search_attrs = '(' . $LDAP_options['search_attr'] . "=${username})";
$results = @ldap_search ($connect, $LDAP_options['search_dn'], $search_attrs, array("dn"));
if ($results === FALSE)
return array ('result' => 'CAN');
if (@ldap_count_entries ($connect, $results) != 1)
Expand Down Expand Up @@ -604,17 +611,23 @@ function queryLDAPServer ($username, $password)
(
isset ($LDAP_options['displayname_attrs']) &&
$LDAP_options['displayname_attrs'] != '' &&
isset ($LDAP_options['search_dn']) &&
$LDAP_options['search_dn'] != '' &&
isset ($LDAP_options['search_attr']) &&
$LDAP_options['search_attr'] != ''
((isset ($LDAP_options['search_filter']) &&
$LDAP_options['search_filter'] != '') ||
(isset ($LDAP_options['search_attr']) &&
$LDAP_options['search_attr'] != ''))
)
{
// compatibility: if 'search_filter' exists, use that one instead, as 'search_attr' is very limiting.
if (isset ($LDAP_options['search_filter']))
$search_attrs = str_replace('%USERNAME%', $username, $LDAP_options['search_filter']);
else
$search_attrs = '(' . $LDAP_options['search_attr'] . "=${username})";

$results = @ldap_search
(
$connect,
$LDAP_options['search_dn'],
'(' . $LDAP_options['search_attr'] . "=${username})",
$search_attrs,
array_merge (array ($LDAP_options['group_attr']), explode (' ', $LDAP_options['displayname_attrs']))
);
if (@ldap_count_entries ($connect, $results) != 1)
Expand Down