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

Merge pull request #3203 from tubhh/LDAP_bugfix

Browse Source 
LDAP Authentication: use generic exception instead of special SQLException
This commit is contained in:
Tim Donohue
2021-03-25 14:42:13 -05:00
committed by GitHub
parent 8f5c826781 68d311ddd0
commit 13d8ce6312
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -141,6 +141,15 @@ public class LDAPAuthentication
// Prevents anonymous users from being added to this group, and the second check // Prevents anonymous users from being added to this group, and the second check
// ensures they are LDAP users // ensures they are LDAP users
try { try {
// without a logged in user, this method should return an empty list
if (context.getCurrentUser() == null) {
return Collections.EMPTY_LIST;
}
// if the logged in user does not have a netid, it's not an LDAP user
// and this method should return an empty list
if (context.getCurrentUser().getNetid() == null) {
return Collections.EMPTY_LIST;
}
if (!context.getCurrentUser().getNetid().equals("")) { if (!context.getCurrentUser().getNetid().equals("")) {
String groupName = configurationService.getProperty("authentication-ldap.login.specialgroup"); String groupName = configurationService.getProperty("authentication-ldap.login.specialgroup");
if ((groupName != null) && (!groupName.trim().equals(""))) { if ((groupName != null) && (!groupName.trim().equals(""))) {