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

fix #2604 remove duplicated roles

Browse source
This commit is contained in:
Shinsuke Sugaya 2021-12-01 21:21:28 +09:00
parent 075a66d7ab
commit 0b4d364e1f
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/main/java/org/codelibs/fess/ldap/LdapUser.java
View file

@ -17,6 +17,7 @@ package org.codelibs.fess.ldap;
import static org.codelibs.core.stream.StreamUtil.stream;
import java.util.Arrays;
import java.util.Hashtable;
import org.apache.commons.lang3.ArrayUtils;
@ -56,10 +57,10 @@ public class LdapUser implements FessUser {
final String groupFilter = fessConfig.getLdapGroupFilter();
if (StringUtil.isNotBlank(baseDn) && StringUtil.isNotBlank(accountFilter)) {
final LdapManager ldapManager = ComponentUtil.getLdapManager();
permissions = ArrayUtils.addAll(ldapManager.getRoles(this, baseDn, accountFilter, groupFilter, roles -> {
permissions = roles;
permissions = distinct(ArrayUtils.addAll(ldapManager.getRoles(this, baseDn, accountFilter, groupFilter, roles -> {
permissions = distinct(roles);
ComponentUtil.getActivityHelper().permissionChanged(OptionalThing.of(new FessUserBean(this)));
}), fessConfig.getRoleSearchUserPrefix() + ldapManager.normalizePermissionName(getName()));
}), fessConfig.getRoleSearchUserPrefix() + ldapManager.normalizePermissionName(getName())));
} else {
permissions = StringUtil.EMPTY_STRINGS;
}
@ -90,4 +91,14 @@ public class LdapUser implements FessUser {
return ComponentUtil.getFessConfig().isLdapAdminEnabled(name);
}
private static String[] distinct(final String[] values) {
if (values == null) {
return StringUtil.EMPTY_STRINGS;
}
if (values.length < 2) {
return values;
}
return Arrays.stream(values).distinct().toArray(n -> new String[n]);
}
}