Simplify hellowebfluxfn

This sample should be absolute minimal example
This commit is contained in:
Rob Winch 2017-09-13 10:39:42 -05:00
parent 164404c7d3
commit 1fe414379c
6 changed files with 109 additions and 341 deletions

View File

@ -15,13 +15,14 @@
*/ */
package sample; package sample;
import java.time.Duration;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpHeaders; import org.springframework.http.ResponseCookie;
import org.springframework.http.HttpStatus;
import org.springframework.security.web.server.header.ContentTypeOptionsHttpHeadersWriter;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.junit4.SpringRunner;
@ -29,10 +30,6 @@ import org.springframework.test.web.reactive.server.ExchangeResult;
import org.springframework.test.web.reactive.server.WebTestClient; import org.springframework.test.web.reactive.server.WebTestClient;
import org.springframework.web.reactive.function.client.ExchangeFilterFunction; import org.springframework.web.reactive.function.client.ExchangeFilterFunction;
import java.nio.charset.Charset;
import java.time.Duration;
import java.util.Base64;
import static org.springframework.web.reactive.function.client.ExchangeFilterFunctions.basicAuthentication; import static org.springframework.web.reactive.function.client.ExchangeFilterFunctions.basicAuthentication;
/** /**
@ -57,161 +54,67 @@ public class HelloWebfluxFnApplicationITests {
} }
@Test @Test
public void basicRequired() throws Exception { public void basicWhenNoCredentialsThenUnauthorized() throws Exception {
this.rest this.rest
.get() .get()
.uri("/users") .uri("/")
.exchange() .exchange()
.expectStatus().isUnauthorized(); .expectStatus().isUnauthorized();
} }
@Test @Test
public void basicWorks() throws Exception { public void basicWhenValidCredentialsThenOk() throws Exception {
this.rest this.rest
.mutate() .mutate()
.filter(robsCredentials()) .filter(userCredentials())
.build() .build()
.get() .get()
.uri("/principal") .uri("/")
.exchange() .exchange()
.expectStatus().isOk() .expectStatus().isOk()
.expectBody().json("{\"username\":\"rob\"}"); .expectBody().json("{\"message\":\"Hello user!\"}");
} }
@Test @Test
public void basicWhenPasswordInvalid401() throws Exception { public void basicWhenInvalidCredentialsThenUnauthorized() throws Exception {
this.rest this.rest
.mutate() .mutate()
.filter(invalidPassword()) .filter(invalidPassword())
.build() .build()
.get() .get()
.uri("/principal") .uri("/")
.exchange() .exchange()
.expectStatus().isUnauthorized() .expectStatus().isUnauthorized()
.expectBody().isEmpty(); .expectBody().isEmpty();
} }
@Test
public void authorizationAdmin403() throws Exception {
this.rest
.mutate()
.filter(robsCredentials())
.build()
.get()
.uri("/admin")
.exchange()
.expectStatus().isEqualTo(HttpStatus.FORBIDDEN)
.expectBody().isEmpty();
}
@Test
public void authorizationAdmin200() throws Exception {
this.rest
.mutate()
.filter(adminCredentials())
.build()
.get()
.uri("/admin")
.exchange()
.expectStatus().isOk();
}
@Test
public void basicMissingUser401() throws Exception {
this.rest
.mutate()
.filter(basicAuthentication("missing-user", "password"))
.build()
.get()
.uri("/admin")
.exchange()
.expectStatus().isUnauthorized();
}
@Test
public void basicInvalidPassword401() throws Exception {
this.rest
.mutate()
.filter(invalidPassword())
.build()
.get()
.uri("/admin")
.exchange()
.expectStatus().isUnauthorized();
}
@Test
public void basicInvalidParts401() throws Exception {
this.rest
.get()
.uri("/admin")
.header("Authorization", "Basic " + base64Encode("no colon"))
.exchange()
.expectStatus().isUnauthorized();
}
@Test @Test
public void sessionWorks() throws Exception { public void sessionWorks() throws Exception {
ExchangeResult result = this.rest ExchangeResult result = this.rest
.mutate() .mutate()
.filter(robsCredentials()) .filter(userCredentials())
.build() .build()
.get() .get()
.uri("/principal") .uri("/")
.exchange() .exchange()
.expectStatus().isOk()
.returnResult(String.class); .returnResult(String.class);
String session = result.getResponseHeaders().getFirst("Set-Cookie"); ResponseCookie session = result.getResponseCookies().getFirst("SESSION");
this.rest this.rest
.get() .get()
.uri("/principal") .uri("/")
.header("Cookie", session) .cookie(session.getName(), session.getValue())
.exchange() .exchange()
.expectStatus().isOk(); .expectStatus().isOk();
} }
@Test private ExchangeFilterFunction userCredentials() {
public void principal() throws Exception { return basicAuthentication("user","user");
this.rest
.mutate()
.filter(robsCredentials())
.build()
.get()
.uri("/principal")
.exchange()
.expectStatus().isOk()
.expectBody().json("{\"username\" : \"rob\"}");
}
@Test
public void headers() throws Exception {
this.rest
.mutate()
.filter(robsCredentials())
.build()
.get()
.uri("/principal")
.exchange()
.expectHeader().valueEquals(HttpHeaders.CACHE_CONTROL, "no-cache, no-store, max-age=0, must-revalidate")
.expectHeader().valueEquals(HttpHeaders.EXPIRES, "0")
.expectHeader().valueEquals(HttpHeaders.PRAGMA, "no-cache")
.expectHeader().valueEquals(ContentTypeOptionsHttpHeadersWriter.X_CONTENT_OPTIONS, ContentTypeOptionsHttpHeadersWriter.NOSNIFF);
}
private ExchangeFilterFunction robsCredentials() {
return basicAuthentication("rob","rob");
} }
private ExchangeFilterFunction invalidPassword() { private ExchangeFilterFunction invalidPassword() {
return basicAuthentication("rob","INVALID"); return basicAuthentication("user","INVALID");
}
private ExchangeFilterFunction adminCredentials() {
return basicAuthentication("admin","admin");
}
private String base64Encode(String value) {
return Base64.getEncoder().encodeToString(value.getBytes(Charset.defaultCharset()));
} }
} }

View File

@ -16,40 +16,30 @@
package sample; package sample;
import java.security.Principal;
import java.util.Collections;
import reactor.core.publisher.Mono;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.userdetails.User;
import org.springframework.security.web.server.context.SecurityContextRepository;
import org.springframework.security.web.server.context.WebSessionSecurityContextRepository;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.web.reactive.function.server.ServerRequest; import org.springframework.web.reactive.function.server.ServerRequest;
import org.springframework.web.reactive.function.server.ServerResponse; import org.springframework.web.reactive.function.server.ServerResponse;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import java.util.Collections;
import java.util.Map;
/** /**
* @author Rob Winch * @author Rob Winch
* @since 5.0 * @since 5.0
*/ */
@Component @Component
public class UserController { public class HelloUserController {
private final SecurityContextRepository repo = new WebSessionSecurityContextRepository();
public Mono<ServerResponse> hello(ServerRequest serverRequest) {
public Mono<ServerResponse> principal(ServerRequest serverRequest) { return serverRequest.principal()
return serverRequest.principal().cast(Authentication.class).flatMap(p -> .map(Principal::getName)
ServerResponse.ok() .flatMap(username ->
.contentType(MediaType.APPLICATION_JSON) ServerResponse.ok()
.syncBody(p.getPrincipal())); .contentType(MediaType.APPLICATION_JSON)
} .syncBody(Collections.singletonMap("message", "Hello " + username + "!"))
);
public Mono<ServerResponse> admin(ServerRequest serverRequest) {
return serverRequest.principal().cast(Authentication.class).flatMap(p ->
ServerResponse.ok()
.contentType(MediaType.APPLICATION_JSON)
.syncBody( Collections.singletonMap("isadmin", "true")));
} }
} }

View File

@ -53,16 +53,16 @@ public class HelloWebfluxFnApplication {
@Bean @Bean
public NettyContext nettyContext(HttpHandler handler) { public NettyContext nettyContext(HttpHandler handler) {
ReactorHttpHandlerAdapter adapter = new ReactorHttpHandlerAdapter(handler); ReactorHttpHandlerAdapter adapter = new ReactorHttpHandlerAdapter(handler);
HttpServer httpServer = HttpServer.create("localhost", port); HttpServer httpServer = HttpServer.create("localhost", this.port);
return httpServer.newHandler(adapter).block(); return httpServer.newHandler(adapter).block();
} }
@Bean @Bean
public RouterFunction<ServerResponse> routes(UserController userController) { public RouterFunction<ServerResponse> routes(HelloUserController userController) {
return route( return route(
GET("/principal"), userController::principal).andRoute( GET("/"), userController::hello);
GET("/admin"), userController::admin);
} }
@Bean @Bean
public HttpHandler httpHandler(RouterFunction<ServerResponse> routes, WebFilter springSecurityFilterChain) { public HttpHandler httpHandler(RouterFunction<ServerResponse> routes, WebFilter springSecurityFilterChain) {
HandlerStrategies handlerStrategies = HandlerStrategies.builder() HandlerStrategies handlerStrategies = HandlerStrategies.builder()

View File

@ -0,0 +1,42 @@
/*
*
* * Copyright 2002-2017 the original author or authors.
* *
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
* * You may obtain a copy of the License at
* *
* * http://www.apache.org/licenses/LICENSE-2.0
* *
* * Unless required by applicable law or agreed to in writing, software
* * distributed under the License is distributed on an "AS IS" BASIS,
* * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* * See the License for the specific language governing permissions and
* * limitations under the License.
*
*/
package sample;
import org.springframework.context.annotation.Bean;
import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
import org.springframework.security.core.userdetails.MapUserDetailsRepository;
import org.springframework.security.core.userdetails.User;
import org.springframework.security.core.userdetails.UserDetails;
/**
* @author Rob Winch
* @since 5.0
*/
@EnableWebFluxSecurity
public class HelloWebfluxFnSecurityConfig {
@Bean
public MapUserDetailsRepository userDetailsRepository() {
UserDetails user = User.withUsername("user")
.password("user")
.roles("USER")
.build();
return new MapUserDetailsRepository(user);
}
}

View File

@ -1,65 +0,0 @@
/*
*
* * Copyright 2002-2017 the original author or authors.
* *
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
* * You may obtain a copy of the License at
* *
* * http://www.apache.org/licenses/LICENSE-2.0
* *
* * Unless required by applicable law or agreed to in writing, software
* * distributed under the License is distributed on an "AS IS" BASIS,
* * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* * See the License for the specific language governing permissions and
* * limitations under the License.
*
*/
package sample;
import org.springframework.context.annotation.Bean;
import org.springframework.security.core.userdetails.MapUserDetailsRepository;
import org.springframework.security.authorization.AuthorizationDecision;
import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
import org.springframework.security.config.web.server.HttpSecurity;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.userdetails.User;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.web.server.SecurityWebFilterChain;
import org.springframework.security.web.server.WebFilterChainFilter;
import org.springframework.security.web.server.authorization.AuthorizationContext;
import reactor.core.publisher.Mono;
/**
* @author Rob Winch
* @since 5.0
*/
@EnableWebFluxSecurity
public class SecurityConfig {
@Bean
SecurityWebFilterChain httpSecurity(HttpSecurity http) throws Exception {
return http
.authorizeExchange()
.pathMatchers("/admin/**").hasRole("ADMIN")
.pathMatchers("/users/{user}/**").access(this::currentUserMatchesPath)
.anyExchange().authenticated()
.and()
.build();
}
private Mono<AuthorizationDecision> currentUserMatchesPath(Mono<Authentication> authentication, AuthorizationContext context) {
return authentication
.map( a -> context.getVariables().get("user").equals(a.getName()))
.map( granted -> new AuthorizationDecision(granted));
}
@Bean
public MapUserDetailsRepository userDetailsRepository() {
UserDetails rob = User.withUsername("rob").password("rob").roles("USER").build();
UserDetails admin = User.withUsername("admin").password("admin").roles("USER","ADMIN").build();
return new MapUserDetailsRepository(rob, admin);
}
}

View File

@ -20,13 +20,10 @@ package sample;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseCookie; import org.springframework.http.ResponseCookie;
import org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers;
import org.springframework.security.web.server.WebFilterChainFilter; import org.springframework.security.web.server.WebFilterChainFilter;
import org.springframework.security.web.server.header.ContentTypeOptionsHttpHeadersWriter;
import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.junit4.SpringRunner;
@ -35,9 +32,7 @@ import org.springframework.test.web.reactive.server.WebTestClient;
import org.springframework.web.reactive.function.client.ExchangeFilterFunction; import org.springframework.web.reactive.function.client.ExchangeFilterFunction;
import org.springframework.web.reactive.function.server.RouterFunction; import org.springframework.web.reactive.function.server.RouterFunction;
import java.nio.charset.Charset; import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.mockUser;
import java.util.Base64;
import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.springSecurity; import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.springSecurity;
import static org.springframework.web.reactive.function.client.ExchangeFilterFunctions.basicAuthentication; import static org.springframework.web.reactive.function.client.ExchangeFilterFunctions.basicAuthentication;
@ -59,188 +54,91 @@ public class HelloWebfluxFnApplicationTests {
@Before @Before
public void setup() { public void setup() {
this.rest = WebTestClient this.rest = WebTestClient
.bindToRouterFunction(routerFunction) .bindToRouterFunction(this.routerFunction)
.webFilter(springSecurityFilterChain) .webFilter(this.springSecurityFilterChain)
.apply(springSecurity())
.build(); .build();
} }
@Test @Test
public void basicRequired() throws Exception { public void basicWhenNoCredentialsThenUnauthorized() throws Exception {
this.rest this.rest
.get() .get()
.uri("/principal") .uri("/")
.exchange() .exchange()
.expectStatus().isUnauthorized(); .expectStatus().isUnauthorized();
} }
@Test @Test
public void basicWorks() throws Exception { public void basicWhenValidCredentialsThenOk() throws Exception {
this.rest this.rest
.mutate() .mutate()
.filter(robsCredentials()) .filter(userCredentials())
.build() .build()
.get() .get()
.uri("/principal") .uri("/")
.exchange() .exchange()
.expectStatus().isOk() .expectStatus().isOk()
.expectBody().json("{\"username\":\"rob\"}"); .expectBody().json("{\"message\":\"Hello user!\"}");
} }
@Test @Test
public void basicWhenPasswordInvalid401() throws Exception { public void basicWhenInvalidCredentialsThenUnauthorized() throws Exception {
this.rest this.rest
.mutate() .mutate()
.filter(invalidPassword()) .filter(invalidPassword())
.build() .build()
.get() .get()
.uri("/principal") .uri("/")
.exchange() .exchange()
.expectStatus().isUnauthorized() .expectStatus().isUnauthorized()
.expectBody().isEmpty(); .expectBody().isEmpty();
} }
@Test
public void authorizationAdmin403() throws Exception {
this.rest
.mutate()
.filter(robsCredentials())
.build()
.get()
.uri("/admin")
.exchange()
.expectStatus().isEqualTo(HttpStatus.FORBIDDEN)
.expectBody().isEmpty();
}
@Test
public void authorizationAdmin200() throws Exception {
this.rest
.mutate()
.filter(adminCredentials())
.build()
.get()
.uri("/admin")
.exchange()
.expectStatus().isOk();
}
@Test
public void basicMissingUser401() throws Exception {
this.rest
.mutate()
.filter(basicAuthentication("missing-user", "password"))
.build()
.get()
.uri("/admin")
.exchange()
.expectStatus().isUnauthorized();
}
@Test
public void basicInvalidPassword401() throws Exception {
this.rest
.mutate()
.filter(invalidPassword())
.build()
.get()
.uri("/admin")
.exchange()
.expectStatus().isUnauthorized();
}
@Test
public void basicInvalidParts401() throws Exception {
this.rest
.get()
.uri("/admin")
.header("Authorization", "Basic " + base64Encode("no colon"))
.exchange()
.expectStatus().isUnauthorized();
}
@Test @Test
public void sessionWorks() throws Exception { public void sessionWorks() throws Exception {
ExchangeResult result = this.rest ExchangeResult result = this.rest
.mutate() .mutate()
.filter(robsCredentials()) .filter(userCredentials())
.build() .build()
.get() .get()
.uri("/principal") .uri("/")
.exchange() .exchange()
.expectStatus().isOk()
.returnResult(String.class); .returnResult(String.class);
ResponseCookie session = result.getResponseCookies().getFirst("SESSION"); ResponseCookie session = result.getResponseCookies().getFirst("SESSION");
this.rest this.rest
.get() .get()
.uri("/principal") .uri("/")
.cookie(session.getName(), session.getValue()) .cookie(session.getName(), session.getValue())
.exchange() .exchange()
.expectStatus().isOk(); .expectStatus().isOk();
} }
@Test @Test
public void mockSupport() throws Exception { public void mockSupportWhenValidMockUserThenOk() throws Exception {
WebTestClient mockRest = WebTestClient.bindToRouterFunction(this.routerFunction) this.rest
.webFilter(springSecurityFilterChain) .mutateWith(mockUser())
.apply(springSecurity())
.build();
mockRest
.mutateWith(SecurityMockServerConfigurers.mockUser())
.get() .get()
.uri("/principal") .uri("/")
.exchange() .exchange()
.expectStatus().isOk(); .expectStatus().isOk()
.expectBody().json("{\"message\":\"Hello user!\"}");
mockRest this.rest
.get() .get()
.uri("/principal") .uri("/")
.exchange() .exchange()
.expectStatus().isUnauthorized(); .expectStatus().isUnauthorized();
} }
@Test private ExchangeFilterFunction userCredentials() {
public void principal() throws Exception { return basicAuthentication("user","user");
this.rest
.mutate()
.filter(robsCredentials())
.build()
.get()
.uri("/principal")
.exchange()
.expectStatus().isOk()
.expectBody().json("{\"username\" : \"rob\"}");
}
@Test
public void headers() throws Exception {
this.rest
.mutate()
.filter(robsCredentials())
.build()
.get()
.uri("/principal")
.exchange()
.expectHeader().valueEquals(HttpHeaders.CACHE_CONTROL, "no-cache, no-store, max-age=0, must-revalidate")
.expectHeader().valueEquals(HttpHeaders.EXPIRES, "0")
.expectHeader().valueEquals(HttpHeaders.PRAGMA, "no-cache")
.expectHeader().valueEquals(ContentTypeOptionsHttpHeadersWriter.X_CONTENT_OPTIONS, ContentTypeOptionsHttpHeadersWriter.NOSNIFF);
}
private ExchangeFilterFunction robsCredentials() {
return basicAuthentication("rob","rob");
} }
private ExchangeFilterFunction invalidPassword() { private ExchangeFilterFunction invalidPassword() {
return basicAuthentication("rob","INVALID"); return basicAuthentication("user","INVALID");
}
private ExchangeFilterFunction adminCredentials() {
return basicAuthentication("admin","admin");
}
private String base64Encode(String value) {
return Base64.getEncoder().encodeToString(value.getBytes(Charset.defaultCharset()));
} }
} }