RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bug #1333: Allow specify * in role matching

Browse source 
This will be a wildcard to refer to all users or groups in the LDAP role
matching configuration.

FEA: ItEr76S04BugFixing
This commit is contained in:
Manuel Rego Casasnovas 2012-01-12 17:41:47 +01:00
parent ed294fa214
commit 28a93c17b4
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libreplan-webapp/src/main/java/org/libreplan/web/users/services/LDAPCustomAuthenticationProvider.java
View file

@ -97,6 +97,12 @@ public class LDAPCustomAuthenticationProvider extends
private static final Log LOG = LogFactory
.getLog(LDAPCustomAuthenticationProvider.class);
/**
* LDAP role matching could be configured using an asterix (*) to specify
* all users or groups
*/
private static final String WILDCHAR_ALL = "*";
@Override
protected void additionalAuthenticationChecks(UserDetails arg0,
UsernamePasswordAuthenticationToken arg1)
@ -287,6 +293,11 @@ public class LDAPCustomAuthenticationProvider extends
List<String> rolesReturn = new ArrayList<String>();
for (ConfigurationRolesLDAP roleLDAP : rolesLdap) {
if (roleLDAP.getRoleLdap().equals(WILDCHAR_ALL)) {
rolesReturn.add(roleLDAP.getRoleLibreplan());
continue;
}
// We must make a search for each role-matching in nodes
List<Attribute> resultsSearch = new ArrayList<Attribute>();
resultsSearch.addAll(ldapTemplate.search(
@ -317,6 +328,11 @@ public class LDAPCustomAuthenticationProvider extends
List<String> rolesReturn = new ArrayList<String>();
for (ConfigurationRolesLDAP roleLdap : rolesLdap) {
if (roleLdap.getRoleLdap().equals(WILDCHAR_ALL)) {
rolesReturn.add(roleLdap.getRoleLibreplan());
continue;
}
// We must make a search for each role matching
DirContextAdapter adapter = null;
try {