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

Merge pull request #1920 from atmire/DS-3542_REST-authentication-empty-request-error

Browse Source 
DS-3542: Fix REST authentication error with empty request + test
This commit is contained in:
Terry Brady
2018-01-19 08:15:42 -08:00
committed by GitHub
parent 72e441f55a 787473674d
commit 4e156c6594
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dspace-spring-rest/src/main/java/org/dspace/app/rest/security/DSpaceAuthentication.java
View File

@@ -31,7 +31,7 @@ public class DSpaceAuthentication implements Authentication {
private boolean authenticated = true; private boolean authenticated = true;
public DSpaceAuthentication (EPerson ePerson, List<GrantedAuthority> authorities) { public DSpaceAuthentication(EPerson ePerson, List<GrantedAuthority> authorities) {
this.previousLoginDate = ePerson.getPreviousActive(); this.previousLoginDate = ePerson.getPreviousActive();
this.username = ePerson.getEmail(); this.username = ePerson.getEmail();
this.authorities = authorities; this.authorities = authorities;

12
dspace-spring-rest/src/main/java/org/dspace/app/rest/security/EPersonRestAuthenticationProvider.java
View File

@@ -13,6 +13,7 @@ import static org.dspace.app.rest.security.WebSecurityConfiguration.EPERSON_GRAN
import java.sql.SQLException; import java.sql.SQLException;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Objects;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@@ -37,7 +38,7 @@ import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
/** /**
* This class is reponsible for authenticating a user via REST * This class is responsible for authenticating a user via REST
* *
* @author Frederic Van Reet (frederic dot vanreet at atmire dot com) * @author Frederic Van Reet (frederic dot vanreet at atmire dot com)
* @author Tom Desair (tom dot desair at atmire dot com) * @author Tom Desair (tom dot desair at atmire dot com)
@@ -78,11 +79,11 @@ public class EPersonRestAuthenticationProvider implements AuthenticationProvider
Context newContext = null; Context newContext = null;
Authentication output = null; Authentication output = null;
if(authentication != null && authentication.getCredentials() != null) { if(authentication != null) {
try { try {
newContext = new Context(); newContext = new Context();
String name = authentication.getName(); String name = authentication.getName();
String password = authentication.getCredentials().toString(); String password = Objects.toString(authentication.getCredentials(), null);
int implicitStatus = authenticationService.authenticateImplicit(newContext, null, null, null, request); int implicitStatus = authenticationService.authenticateImplicit(newContext, null, null, null, request);
@@ -104,8 +105,6 @@ public class EPersonRestAuthenticationProvider implements AuthenticationProvider
throw new BadCredentialsException("Login failed"); throw new BadCredentialsException("Login failed");
} }
} }
} catch (Exception e) {
log.error("Error while authenticating in the rest api", e);
} finally { } finally {
if (newContext != null && newContext.isValid()) { if (newContext != null && newContext.isValid()) {
try { try {
@@ -156,7 +155,8 @@ public class EPersonRestAuthenticationProvider implements AuthenticationProvider
return authorities; return authorities;
} }
@Override
public boolean supports(Class<?> authentication) { public boolean supports(Class<?> authentication) {
return authentication.equals(DSpaceAuthentication.class); return DSpaceAuthentication.class.isAssignableFrom(authentication);
} }
} }

8
dspace-spring-rest/src/test/java/org/dspace/app/rest/AuthenticationRestControllerIT.java
View File

@@ -8,6 +8,7 @@
package org.dspace.app.rest; package org.dspace.app.rest;
import static java.lang.Thread.sleep; import static java.lang.Thread.sleep;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.endsWith; import static org.hamcrest.Matchers.endsWith;
import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.startsWith; import static org.hamcrest.Matchers.startsWith;
@@ -285,4 +286,11 @@ public class AuthenticationRestControllerIT extends AbstractControllerIntegratio
} }
@Test
public void testLoginEmptyRequest() throws Exception {
getClient().perform(get("/api/authn/login"))
.andExpect(status().isUnauthorized())
.andExpect(status().reason(containsString("Login failed")));
}
} }