hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-09 19:13:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

DS-1690 assign DSpace group based on LDAP attribute value

Browse Source
This commit is contained in:
Ivan Masár
2013-10-07 16:14:55 +02:00
parent 3db23c0987
commit e41d5818df
2 changed files with 46 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
dspace-api/src/main/java/org/dspace/authenticate/LDAPAuthentication.java
View File

@@ -228,7 +228,7 @@ public class LDAPAuthentication
context.setCurrentUser(eperson);
// assign user to groups based on ldap dn
assignGroupsBasedOnLdapDn(dn, context);
assignGroups(dn, ldap.ldapGroup, context);
log.info(LogManager
.getHeader(context, "authenticate", "type=ldap"));
@@ -275,7 +275,7 @@ public class LDAPAuthentication
context.setCurrentUser(eperson);
// assign user to groups based on ldap dn
assignGroupsBasedOnLdapDn(dn, context);
assignGroups(dn, ldap.ldapGroup, context);
return SUCCESS;
}
@@ -312,7 +312,7 @@ public class LDAPAuthentication
context.setCurrentUser(eperson);
// assign user to groups based on ldap dn
assignGroupsBasedOnLdapDn(dn, context);
assignGroups(dn, ldap.ldapGroup, context);
}
catch (AuthorizeException e)
{
@@ -362,6 +362,7 @@ public class LDAPAuthentication
protected String ldapGivenName = null;
protected String ldapSurname = null;
protected String ldapPhone = null;
protected String ldapGroup = null;
/** LDAP settings */
String ldap_provider_url = ConfigurationManager.getProperty("authentication-ldap", "provider_url");
@@ -373,6 +374,7 @@ public class LDAPAuthentication
String ldap_givenname_field = ConfigurationManager.getProperty("authentication-ldap", "givenname_field");
String ldap_surname_field = ConfigurationManager.getProperty("authentication-ldap", "surname_field");
String ldap_phone_field = ConfigurationManager.getProperty("authentication-ldap", "phone_field");
String ldap_group_field = ConfigurationManager.getProperty("authentication-ldap", "login.groupmap.attribute");
SpeakerToLDAP(Logger thelog)
{
@@ -448,7 +450,7 @@ public class LDAPAuthentication
}
String attlist[] = {ldap_email_field, ldap_givenname_field,
ldap_surname_field, ldap_phone_field};
ldap_surname_field, ldap_phone_field, ldap_group_field};
Attributes atts = sr.getAttributes();
Attribute att;
@@ -483,6 +485,14 @@ public class LDAPAuthentication
ldapPhone = (String) att.get();
}
}
if (attlist[4] != null) {
att = atts.get(attlist[4]);
if (att != null)
{
ldapGroup = (String) att.get();
}
}
if (answer.hasMoreElements()) {
// Oh dear - more than one match
@@ -614,20 +624,29 @@ public class LDAPAuthentication
* Add authenticated users to the group defined in dspace.cfg by
* the authentication-ldap.login.groupmap.* key.
*/
private void assignGroupsBasedOnLdapDn(String dn, Context context)
private void assignGroups(String dn, String group, Context context)
{
if (StringUtils.isNotBlank(dn))
{
System.out.println("dn:" + dn);
int i = 1;
String groupMap = ConfigurationManager.getProperty("authentication-ldap", "login.groupmap." + i);
boolean cmp;
while (groupMap != null)
{
String t[] = groupMap.split(":");
String ldapSearchString = t[0];
String dspaceGroupName = t[1];
if (group == null) {
cmp = StringUtils.containsIgnoreCase(dn, ldapSearchString + ",");
} else {
cmp = StringUtils.equalsIgnoreCase(group, ldapSearchString);
}
if (StringUtils.containsIgnoreCase(dn, ldapSearchString))
if (cmp)
{
// assign user to this group
try