hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-14 21:43:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #663 from tdonohue/DS-1781

Browse Source 
DS-1781 : Ensure LDAP "email_field" is not ignored entirely
This commit is contained in:
helix84
2014-12-18 00:11:06 +01:00
parent c43f050265 b3647121cb
commit d0ad39ce4b
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -250,17 +250,24 @@ public class LDAPAuthentication
log.info(LogManager.getHeader(context, log.info(LogManager.getHeader(context,
"autoregister", "netid=" + netid)); "autoregister", "netid=" + netid));
// If there is no email and the email domain is set, add it to the netid
String email = ldap.ldapEmail; String email = ldap.ldapEmail;
if ((StringUtils.isEmpty(email)) && // Check if we were able to determine an email address from LDAP
(StringUtils.isNotEmpty(ConfigurationManager.getProperty("authentication-ldap", "netid_email_domain")))) if (StringUtils.isEmpty(email))
{ {
email = netid + ConfigurationManager.getProperty("authentication-ldap", "netid_email_domain"); // If no email, check if we have a "netid_email_domain". If so, append it to the netid to create email
} if (StringUtils.isNotEmpty(ConfigurationManager.getProperty("authentication-ldap", "netid_email_domain")))
else {
{ email = netid + ConfigurationManager.getProperty("authentication-ldap", "netid_email_domain");
email = netid; }
else
{
// We don't have a valid email address. We'll default it to 'netid' but log a warning
log.warn(LogManager.getHeader(context, "autoregister",
"Unable to locate email address for account '" + netid + "', so it has been set to '" + netid + "'. " +
"Please check the LDAP 'email_field' OR consider configuring 'netid_email_domain'."));
email = netid;
}
} }
if (StringUtils.isNotEmpty(email)) if (StringUtils.isNotEmpty(email))