Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-07-16 15:23:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

RedirectAuthenticationEntryPoint uses RedirectStrategy

Browse Source 
Issue gh-4529
This commit is contained in:
Rob Winch 2017-09-05 15:16:48 -05:00
parent 06b82e7bd0
commit 4392d47908
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
webflux/src/main/java/org/springframework/security/web/server/authentication/RedirectAuthenticationEntryPoint.java
View File

@ -20,6 +20,8 @@ package org.springframework.security.web.server.authentication;
import java.net.URI;
import org.springframework.security.web.server.DefaultRedirectStrategy;
import org.springframework.security.web.server.RedirectStrategy;
import reactor.core.publisher.Mono;
import org.springframework.http.HttpStatus;
@ -38,7 +40,7 @@ import org.springframework.web.server.ServerWebExchange;
public class RedirectAuthenticationEntryPoint implements AuthenticationEntryPoint {
private final URI location;
private HttpStatus httpStatus = HttpStatus.FOUND;
private RedirectStrategy redirectStrategy = new DefaultRedirectStrategy();
public RedirectAuthenticationEntryPoint(String location) {
Assert.notNull(location, "location cannot be null");
@ -47,20 +49,15 @@ public class RedirectAuthenticationEntryPoint implements AuthenticationEntryPoin
@Override
public Mono<Void> commence(ServerWebExchange exchange, AuthenticationException e) {
return Mono.fromRunnable(() -> {
ServerHttpResponse response = exchange.getResponse();
response.setStatusCode(this.httpStatus);
response.getHeaders().setLocation(this.location);
});
return this.redirectStrategy.sendRedirect(exchange, this.location);
}
/**
* Sets the {@link HttpStatus}.
*
* @param httpStatus the status to use. The default is {@code HttpStatus.FOUND}
* Sets the RedirectStrategy to use.
* @param redirectStrategy the strategy to use. Default is DefaultRedirectStrategy.
*/
public void setHttpStatus(HttpStatus httpStatus) {
Assert.notNull(httpStatus, "httpStatus cannot be null");
this.httpStatus = httpStatus;
public void setRedirectStrategy(RedirectStrategy redirectStrategy) {
Assert.notNull(redirectStrategy, "redirectStrategy cannot be null");
this.redirectStrategy = redirectStrategy;
}
}

19
webflux/src/test/java/org/springframework/security/web/server/authentication/RedirectAuthenticationEntryPointTests.java
View File

@ -27,10 +27,14 @@ import org.springframework.http.HttpStatus;
import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException;
import org.springframework.security.core.AuthenticationException;
import org.springframework.security.web.server.RedirectStrategy;
import org.springframework.web.server.ServerWebExchange;
import reactor.core.publisher.Mono;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;
/**
* @author Rob Winch
@ -41,6 +45,8 @@ public class RedirectAuthenticationEntryPointTests {
@Mock
private ServerWebExchange exchange;
@Mock
private RedirectStrategy redirectStrategy;
private String location = "/login";
@ -76,18 +82,17 @@ public class RedirectAuthenticationEntryPointTests {
@Test
public void commenceWhenCustomStatusThenStatusSet() {
Mono<Void> result = Mono.empty();
when(this.redirectStrategy.sendRedirect(any(), any())).thenReturn(result);
HttpStatus status = HttpStatus.MOVED_PERMANENTLY;
this.entryPoint.setHttpStatus(status);
this.entryPoint.setRedirectStrategy(this.redirectStrategy);
this.exchange = MockServerHttpRequest.get("/").toExchange();
this.entryPoint.commence(this.exchange, this.exception).block();
assertThat(this.exchange.getResponse().getStatusCode()).isEqualTo(status);
assertThat(this.exchange.getResponse().getHeaders().getLocation()).hasPath(this.location);
assertThat(this.entryPoint.commence(this.exchange, this.exception)).isEqualTo(result);
}
@Test(expected = IllegalArgumentException.class)
public void setHttpStatusWhenNullLocationThenException() {
this.entryPoint.setHttpStatus(null);
public void setRedirectStrategyWhenNullThenException() {
this.entryPoint.setRedirectStrategy(null);
}
}