root
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Actions 9 Packages Projects Releases Wiki Activity

ServerRequestCache uses URI 

Issue: gh-4789
This commit is contained in:
Rob Winch 2017-11-15 11:30:33 -06:00
parent 0b1618d8b4
commit 1d9b0760d5
5 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/main/java/org/springframework/security/web/server/authentication/RedirectServerAuthenticationSuccessHandler.java
View File

@ -56,8 +56,6 @@ public class RedirectServerAuthenticationSuccessHandler
Authentication authentication) { Authentication authentication) {
ServerWebExchange exchange = webFilterExchange.getExchange(); ServerWebExchange exchange = webFilterExchange.getExchange();
return this.requestCache.getRequest(exchange) return this.requestCache.getRequest(exchange)
.map(r -> r.getPath().pathWithinApplication().value())
.map(URI::create)
.defaultIfEmpty(this.location) .defaultIfEmpty(this.location)
.flatMap(location -> this.redirectStrategy.sendRedirect(exchange, location)); .flatMap(location -> this.redirectStrategy.sendRedirect(exchange, location));
} }

4
web/src/main/java/org/springframework/security/web/server/savedrequest/NoOpServerRequestCache.java
View File

@ -20,6 +20,8 @@ import org.springframework.http.server.reactive.ServerHttpRequest;
import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.ServerWebExchange;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import java.net.URI;
/** /**
* @author Rob Winch * @author Rob Winch
* @since 5.0 * @since 5.0
@ -31,7 +33,7 @@ public class NoOpServerRequestCache implements ServerRequestCache {
} }
@Override @Override
public Mono<ServerHttpRequest> getRequest(ServerWebExchange exchange) { public Mono<URI> getRequest(ServerWebExchange exchange) {
return Mono.empty(); return Mono.empty();
} }

4
web/src/main/java/org/springframework/security/web/server/savedrequest/ServerRequestCache.java
View File

@ -20,6 +20,8 @@ import org.springframework.http.server.reactive.ServerHttpRequest;
import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.ServerWebExchange;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import java.net.URI;
/** /**
* Saves a {@link ServerHttpRequest} so it can be "replayed" later. This is useful for * Saves a {@link ServerHttpRequest} so it can be "replayed" later. This is useful for
* when a page was requested and authentication is necessary. * when a page was requested and authentication is necessary.
@ -42,7 +44,7 @@ public interface ServerRequestCache {
* @param exchange the exchange to obtain the saved {@link ServerHttpRequest} from * @param exchange the exchange to obtain the saved {@link ServerHttpRequest} from
* @return the {@link ServerHttpRequest} * @return the {@link ServerHttpRequest}
*/ */
Mono<ServerHttpRequest> getRequest(ServerWebExchange exchange); Mono<URI> getRequest(ServerWebExchange exchange);
/** /**
* If the provided {@link ServerWebExchange} matches the saved {@link ServerHttpRequest} * If the provided {@link ServerWebExchange} matches the saved {@link ServerHttpRequest}

8
web/src/main/java/org/springframework/security/web/server/savedrequest/WebSessionServerRequestCache.java
View File

@ -27,6 +27,8 @@ import org.springframework.web.server.ServerWebExchange;
import org.springframework.web.server.WebSession; import org.springframework.web.server.WebSession;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import java.net.URI;
/** /**
* An implementation of {@link ServerRequestCache} that saves the * An implementation of {@link ServerRequestCache} that saves the
* {@link ServerHttpRequest} in the {@link WebSession}. * {@link ServerHttpRequest} in the {@link WebSession}.
@ -68,16 +70,18 @@ public class WebSessionServerRequestCache implements ServerRequestCache {
} }
@Override @Override
public Mono<ServerHttpRequest> getRequest(ServerWebExchange exchange) { public Mono<URI> getRequest(ServerWebExchange exchange) {
return exchange.getSession() return exchange.getSession()
.flatMap(session -> Mono.justOrEmpty(session.<String>getAttribute(this.sessionAttrName))) .flatMap(session -> Mono.justOrEmpty(session.<String>getAttribute(this.sessionAttrName)))
.map(path -> exchange.getRequest().mutate().path(path).build()); .map(URI::create);
} }
@Override @Override
public Mono<ServerHttpRequest> getMatchingRequest( public Mono<ServerHttpRequest> getMatchingRequest(
ServerWebExchange exchange) { ServerWebExchange exchange) {
return getRequest(exchange) return getRequest(exchange)
.map(URI::toASCIIString)
.map(path -> exchange.getRequest().mutate().path(path).build())
.filter( request -> pathInApplication(request).equals( .filter( request -> pathInApplication(request).equals(
pathInApplication(exchange.getRequest()))); pathInApplication(exchange.getRequest())));
} }

10
web/src/test/java/org/springframework/security/web/server/savedrequest/WebSessionServerRequestCacheTests.java
View File

@ -22,6 +22,8 @@ import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
import org.springframework.mock.web.server.MockServerWebExchange; import org.springframework.mock.web.server.MockServerWebExchange;
import org.springframework.security.web.server.util.matcher.ServerWebExchangeMatcher; import org.springframework.security.web.server.util.matcher.ServerWebExchangeMatcher;
import java.net.URI;
import static org.assertj.core.api.Assertions.*; import static org.assertj.core.api.Assertions.*;
/** /**
@ -36,9 +38,9 @@ public class WebSessionServerRequestCacheTests {
MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get("/secured/")); MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get("/secured/"));
this.cache.saveRequest(exchange).block(); this.cache.saveRequest(exchange).block();
ServerHttpRequest saved = this.cache.getRequest(exchange).block(); URI saved = this.cache.getRequest(exchange).block();
assertThat(saved.getURI()).isEqualTo(exchange.getRequest().getURI()); assertThat(saved).isEqualTo(exchange.getRequest().getURI());
} }
@Test @Test
@ -55,9 +57,9 @@ public class WebSessionServerRequestCacheTests {
MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.post("/secured/")); MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.post("/secured/"));
this.cache.saveRequest(exchange).block(); this.cache.saveRequest(exchange).block();
ServerHttpRequest saved = this.cache.getRequest(exchange).block(); URI saved = this.cache.getRequest(exchange).block();
assertThat(saved.getURI()).isEqualTo(exchange.getRequest().getURI()); assertThat(saved).isEqualTo(exchange.getRequest().getURI());
} }
@Test @Test