0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #2432 improve subroles search

Browse source
This commit is contained in:
Shinsuke Sugaya 2020-03-17 06:49:21 +09:00
parent 40f89355f0
commit c304092fe7
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/org/codelibs/fess/ldap/LdapManager.java
View file

@ -202,26 +202,38 @@ public class LdapManager {
if (logger.isDebugEnabled()) {
logger.debug("Account Filter: {}", filter);
}
final Set<String> subRoleSet = new HashSet<>();
search(bindDn, filter, new String[] { fessConfig.getLdapMemberofAttribute() }, () -> ldapUser.getEnvironment(), result -> {
processSearchRoles(result, entryDn -> {
updateSearchRoles(roleSet, entryDn);
if (StringUtil.isNotBlank(groupFilter)) {
processSubRoles(ldapUser, bindDn, entryDn, groupFilter, roleSet);
subRoleSet.add(entryDn);
}
});
});
if (!subRoleSet.isEmpty()) {
processSubRoles(ldapUser, bindDn, subRoleSet, groupFilter, roleSet);
}
if (logger.isDebugEnabled()) {
logger.debug("role: {}", roleSet);
}
return roleSet.toArray(new String[roleSet.size()]);
}
protected void processSubRoles(final LdapUser ldapUser, final String bindDn, final String dn, final String groupFilter,
protected void processSubRoles(final LdapUser ldapUser, final String bindDn, final Set<String> subRoleSet, final String groupFilter,
final Set<String> roleSet) {
// (member:1.2.840.113556.1.4.1941:=%s)
final String filter = String.format(groupFilter, dn);
if (subRoleSet.isEmpty()) {
return;
}
String filter = subRoleSet.stream().map(s -> String.format(groupFilter, s)).collect(Collectors.joining());
if (subRoleSet.size() > 1) {
filter = "(|" + filter + ")";
}
if (logger.isDebugEnabled()) {
logger.debug("Group Filter: {}", filter);
}