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

[DS-4548] Rename DSpace's LogManager to LogHelper.

Browse Source
This commit is contained in:
Mark H. Wood
2021-08-04 11:41:18 -04:00
parent 68f38fcdff
commit b43e5dfdd8
68 changed files with 330 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,7 +36,7 @@ import org.dspace.authenticate.factory.AuthenticateServiceFactory;
import org.dspace.authenticate.service.AuthenticationService;
import org.dspace.authorize.AuthorizeException;
import org.dspace.core.Context;
import org.dspace.core.LogManager;
import org.dspace.core.LogHelper;
import org.dspace.eperson.EPerson;
import org.dspace.eperson.Group;
import org.dspace.eperson.factory.EPersonServiceFactory;
@@ -156,7 +156,7 @@ public class LDAPAuthentication
Group ldapGroup = groupService.findByName(context, groupName);
if (ldapGroup == null) {
// Oops - the group isn't there.
log.warn(LogManager.getHeader(context,
log.warn(LogHelper.getHeader(context,
"ldap_specialgroup",
"Group defined in login.specialgroup does not exist"));
return Collections.EMPTY_LIST;
@@ -211,7 +211,7 @@ public class LDAPAuthentication
String realm,
HttpServletRequest request)
throws SQLException {
log.info(LogManager.getHeader(context, "auth", "attempting trivial auth of user=" + netid));
log.info(LogHelper.getHeader(context, "auth", "attempting trivial auth of user=" + netid));
// Skip out when no netid or password is given.
if (netid == null || password == null) {
@@ -245,7 +245,7 @@ public class LDAPAuthentication
// Check a DN was found
if ((dn == null) || (dn.trim().equals(""))) {
log.info(LogManager
log.info(LogHelper
.getHeader(context, "failed_login", "no DN found for user " + netid));
return BAD_CREDENTIALS;
}
@@ -265,7 +265,7 @@ public class LDAPAuthentication
// assign user to groups based on ldap dn
assignGroups(dn, ldap.ldapGroup, context);
log.info(LogManager
log.info(LogHelper
.getHeader(context, "authenticate", "type=ldap"));
return SUCCESS;
} else {
@@ -277,7 +277,7 @@ public class LDAPAuthentication
if (ldap.ldapAuthenticate(dn, password, context)) {
// Register the new user automatically
log.info(LogManager.getHeader(context,
log.info(LogHelper.getHeader(context,
"autoregister", "netid=" + netid));
String email = ldap.ldapEmail;
@@ -290,7 +290,7 @@ public class LDAPAuthentication
email = netid + configurationService.getProperty("authentication-ldap.netid_email_domain");
} 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",
log.warn(LogHelper.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 " +
@@ -303,7 +303,7 @@ public class LDAPAuthentication
try {
eperson = ePersonService.findByEmail(context, email);
if (eperson != null) {
log.info(LogManager.getHeader(context,
log.info(LogHelper.getHeader(context,
"type=ldap-login", "type=ldap_but_already_email"));
context.turnOffAuthorisationSystem();
eperson.setNetid(netid.toLowerCase());
@@ -350,12 +350,12 @@ public class LDAPAuthentication
context.restoreAuthSystemState();
}
log.info(LogManager.getHeader(context, "authenticate",
log.info(LogHelper.getHeader(context, "authenticate",
"type=ldap-login, created ePerson"));
return SUCCESS;
} else {
// No auto-registration for valid certs
log.info(LogManager.getHeader(context,
log.info(LogHelper.getHeader(context,
"failed_login", "type=ldap_but_no_record"));
return NO_SUCH_USER;
}
@@ -429,7 +429,7 @@ public class LDAPAuthentication
} catch (NumberFormatException e) {
// Log the error if it has been set but is invalid
if (ldap_search_scope != null) {
log.warn(LogManager.getHeader(context,
log.warn(LogHelper.getHeader(context,
"ldap_authentication", "invalid search scope: " + ldap_search_scope));
}
}
@@ -548,19 +548,19 @@ public class LDAPAuthentication
// Ambiguous user, can't continue
} else {
log.debug(LogManager.getHeader(context, "got DN", resultDN));
log.debug(LogHelper.getHeader(context, "got DN", resultDN));
return resultDN;
}
}
} catch (NamingException e) {
// if the lookup fails go ahead and create a new record for them because the authentication
// succeeded
log.warn(LogManager.getHeader(context,
log.warn(LogHelper.getHeader(context,
"ldap_attribute_lookup", "type=failed_search "
+ e));
}
} catch (NamingException | IOException e) {
log.warn(LogManager.getHeader(context,
log.warn(LogHelper.getHeader(context,
"ldap_authentication", "type=failed_auth " + e));
} finally {
// Close the context when we're done
@@ -630,7 +630,7 @@ public class LDAPAuthentication
}
} catch (NamingException | IOException e) {
// something went wrong (like wrong password) so return false
log.warn(LogManager.getHeader(context,
log.warn(LogHelper.getHeader(context,
"ldap_authentication", "type=failed_auth " + e));
return false;
} finally {
@@ -714,18 +714,18 @@ public class LDAPAuthentication
groupService.update(context, ldapGroup);
} else {
// The group does not exist
log.warn(LogManager.getHeader(context,
log.warn(LogHelper.getHeader(context,
"ldap_assignGroupsBasedOnLdapDn",
"Group defined in authentication-ldap.login.groupmap." + i
+ " does not exist :: " + dspaceGroupName));
}
} catch (AuthorizeException ae) {
log.debug(LogManager.getHeader(context,
log.debug(LogHelper.getHeader(context,
"assignGroupsBasedOnLdapDn could not authorize addition to " +
"group",
dspaceGroupName));
} catch (SQLException e) {
log.debug(LogManager.getHeader(context, "assignGroupsBasedOnLdapDn could not find group",
log.debug(LogHelper.getHeader(context, "assignGroupsBasedOnLdapDn could not find group",
dspaceGroupName));
}
}