From 7271a427e8169599dcb520df3fd004f42af0dcb0 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Tue, 10 Oct 2017 17:00:10 -0500 Subject: [PATCH] SecurityContextServerRepository->ServerSecurityContextRepository Issue gh-4615 --- .../config/web/server/ServerHttpSecurity.java | 42 +++++++++---------- .../web/server/ServerHttpSecurityTests.java | 8 ++-- .../AuthenticationWebFilter.java | 18 ++++---- .../SecurityContextServerLogoutHandler.java | 6 +-- ...ityContextRepositoryServerWebExchange.java | 4 +- .../SecurityContextRepositoryWebFilter.java | 4 +- ...a => ServerSecurityContextRepository.java} | 2 +- ...ibuteServerSecurityContextRepository.java} | 4 +- ...ssionServerSecurityContextRepository.java} | 4 +- .../AuthenticationWebFilterTests.java | 18 ++++---- ...urityContextRepositoryWebFilterTests.java} | 6 +-- ...ServerSecurityContextRepositoryTests.java} | 4 +- 12 files changed, 60 insertions(+), 60 deletions(-) rename webflux/src/main/java/org/springframework/security/web/server/context/{SecurityContextServerRepository.java => ServerSecurityContextRepository.java} (95%) rename webflux/src/main/java/org/springframework/security/web/server/context/{ServerWebExchangeAttributeSecurityContextServerRepository.java => ServerWebExchangeAttributeServerSecurityContextRepository.java} (91%) rename webflux/src/main/java/org/springframework/security/web/server/context/{WebSessionSecurityContextServerRepository.java => WebSessionServerSecurityContextRepository.java} (93%) rename webflux/src/test/java/org/springframework/security/web/server/context/{SecurityContextServerRepositoryWebFilterTests.java => ServerSecurityContextRepositoryWebFilterTests.java} (95%) rename webflux/src/test/java/org/springframework/security/web/server/context/{ServerWebExchangeAttributeSecurityContextServerRepositoryTests.java => ServerWebExchangeAttributeServerSecurityContextRepositoryTests.java} (88%) diff --git a/config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java b/config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java index 1f7c3499d2..331f3f4398 100644 --- a/config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java +++ b/config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java @@ -44,10 +44,10 @@ import org.springframework.security.web.server.authorization.AuthorizationWebFil import org.springframework.security.web.server.authorization.DelegatingReactiveAuthorizationManager; import org.springframework.security.web.server.authorization.ExceptionTranslationWebFilter; import org.springframework.security.web.server.context.AuthenticationReactorContextWebFilter; -import org.springframework.security.web.server.context.SecurityContextServerRepository; +import org.springframework.security.web.server.context.ServerSecurityContextRepository; import org.springframework.security.web.server.context.SecurityContextRepositoryWebFilter; -import org.springframework.security.web.server.context.ServerWebExchangeAttributeSecurityContextServerRepository; -import org.springframework.security.web.server.context.WebSessionSecurityContextServerRepository; +import org.springframework.security.web.server.context.ServerWebExchangeAttributeServerSecurityContextRepository; +import org.springframework.security.web.server.context.WebSessionServerSecurityContextRepository; import org.springframework.security.web.server.header.CacheControlServerHttpHeadersWriter; import org.springframework.security.web.server.header.CompositeServerHttpHeadersWriter; import org.springframework.security.web.server.header.ContentTypeOptionsServerHttpHeadersWriter; @@ -94,7 +94,7 @@ public class ServerHttpSecurity { private ReactiveAuthenticationManager authenticationManager; - private SecurityContextServerRepository securityContextServerRepository; + private ServerSecurityContextRepository serverSecurityContextRepository; private ServerAuthenticationEntryPoint serverAuthenticationEntryPoint; @@ -127,9 +127,9 @@ public class ServerHttpSecurity { return this.securityMatcher; } - public ServerHttpSecurity securityContextRepository(SecurityContextServerRepository securityContextServerRepository) { - Assert.notNull(securityContextServerRepository, "securityContextRepository cannot be null"); - this.securityContextServerRepository = securityContextServerRepository; + public ServerHttpSecurity securityContextRepository(ServerSecurityContextRepository serverSecurityContextRepository) { + Assert.notNull(serverSecurityContextRepository, "securityContextRepository cannot be null"); + this.serverSecurityContextRepository = serverSecurityContextRepository; return this; } @@ -183,15 +183,15 @@ public class ServerHttpSecurity { } if(this.httpBasic != null) { this.httpBasic.authenticationManager(this.authenticationManager); - if(this.securityContextServerRepository != null) { - this.httpBasic.securityContextRepository(this.securityContextServerRepository); + if(this.serverSecurityContextRepository != null) { + this.httpBasic.securityContextRepository(this.serverSecurityContextRepository); } this.httpBasic.configure(this); } if(this.formLogin != null) { this.formLogin.authenticationManager(this.authenticationManager); - if(this.securityContextServerRepository != null) { - this.formLogin.securityContextRepository(this.securityContextServerRepository); + if(this.serverSecurityContextRepository != null) { + this.formLogin.securityContextRepository(this.serverSecurityContextRepository); } if(this.formLogin.serverAuthenticationEntryPoint == null) { this.webFilters.add(new OrderedWebFilter(new LoginPageGeneratingWebFilter(), SecurityWebFiltersOrder.LOGIN_PAGE_GENERATING.getOrder())); @@ -233,7 +233,7 @@ public class ServerHttpSecurity { } private WebFilter securityContextRepositoryWebFilter() { - SecurityContextServerRepository repository = this.securityContextServerRepository; + ServerSecurityContextRepository repository = this.serverSecurityContextRepository; if(repository == null) { return null; } @@ -322,7 +322,7 @@ public class ServerHttpSecurity { public class HttpBasicBuilder { private ReactiveAuthenticationManager authenticationManager; - private SecurityContextServerRepository securityContextServerRepository = new ServerWebExchangeAttributeSecurityContextServerRepository(); + private ServerSecurityContextRepository serverSecurityContextRepository = new ServerWebExchangeAttributeServerSecurityContextRepository(); private ServerAuthenticationEntryPoint entryPoint = new HttpBasicServerAuthenticationEntryPoint(); @@ -331,8 +331,8 @@ public class ServerHttpSecurity { return this; } - public HttpBasicBuilder securityContextRepository(SecurityContextServerRepository securityContextServerRepository) { - this.securityContextServerRepository = securityContextServerRepository; + public HttpBasicBuilder securityContextRepository(ServerSecurityContextRepository serverSecurityContextRepository) { + this.serverSecurityContextRepository = serverSecurityContextRepository; return this; } @@ -357,8 +357,8 @@ public class ServerHttpSecurity { this.authenticationManager); authenticationFilter.setServerAuthenticationFailureHandler(new ServerAuthenticationEntryPointFailureHandler(this.entryPoint)); authenticationFilter.setAuthenticationConverter(new ServerHttpBasicAuthenticationConverter()); - if(this.securityContextServerRepository != null) { - authenticationFilter.setSecurityContextServerRepository(this.securityContextServerRepository); + if(this.serverSecurityContextRepository != null) { + authenticationFilter.setServerSecurityContextRepository(this.serverSecurityContextRepository); } http.addFilterAt(authenticationFilter, SecurityWebFiltersOrder.HTTP_BASIC); } @@ -373,7 +373,7 @@ public class ServerHttpSecurity { public class FormLoginBuilder { private ReactiveAuthenticationManager authenticationManager; - private SecurityContextServerRepository securityContextServerRepository = new WebSessionSecurityContextServerRepository(); + private ServerSecurityContextRepository serverSecurityContextRepository = new WebSessionServerSecurityContextRepository(); private ServerAuthenticationEntryPoint serverAuthenticationEntryPoint; @@ -408,8 +408,8 @@ public class ServerHttpSecurity { return this; } - public FormLoginBuilder securityContextRepository(SecurityContextServerRepository securityContextServerRepository) { - this.securityContextServerRepository = securityContextServerRepository; + public FormLoginBuilder securityContextRepository(ServerSecurityContextRepository serverSecurityContextRepository) { + this.serverSecurityContextRepository = serverSecurityContextRepository; return this; } @@ -436,7 +436,7 @@ public class ServerHttpSecurity { authenticationFilter.setServerAuthenticationFailureHandler(this.serverAuthenticationFailureHandler); authenticationFilter.setAuthenticationConverter(new ServerFormLoginAuthenticationConverter()); authenticationFilter.setServerAuthenticationSuccessHandler(new RedirectServerAuthenticationSuccessHandler("/")); - authenticationFilter.setSecurityContextServerRepository(this.securityContextServerRepository); + authenticationFilter.setServerSecurityContextRepository(this.serverSecurityContextRepository); http.addFilterAt(authenticationFilter, SecurityWebFiltersOrder.FORM_LOGIN); } diff --git a/config/src/test/java/org/springframework/security/config/web/server/ServerHttpSecurityTests.java b/config/src/test/java/org/springframework/security/config/web/server/ServerHttpSecurityTests.java index a27c84026a..1a53a6c4fd 100644 --- a/config/src/test/java/org/springframework/security/config/web/server/ServerHttpSecurityTests.java +++ b/config/src/test/java/org/springframework/security/config/web/server/ServerHttpSecurityTests.java @@ -26,8 +26,8 @@ import org.springframework.security.authentication.ReactiveAuthenticationManager import org.springframework.security.authentication.TestingAuthenticationToken; import org.springframework.security.test.web.reactive.server.WebTestClientBuilder; import org.springframework.security.web.server.WebFilterChainProxy; -import org.springframework.security.web.server.context.SecurityContextServerRepository; -import org.springframework.security.web.server.context.WebSessionSecurityContextServerRepository; +import org.springframework.security.web.server.context.ServerSecurityContextRepository; +import org.springframework.security.web.server.context.WebSessionServerSecurityContextRepository; import org.springframework.test.web.reactive.server.EntityExchangeResult; import org.springframework.test.web.reactive.server.FluxExchangeResult; import org.springframework.test.web.reactive.server.WebTestClient; @@ -45,7 +45,7 @@ import static org.springframework.web.reactive.function.client.ExchangeFilterFun */ @RunWith(MockitoJUnitRunner.class) public class ServerHttpSecurityTests { - @Mock SecurityContextServerRepository contextRepository; + @Mock ServerSecurityContextRepository contextRepository; @Mock ReactiveAuthenticationManager authenticationManager; @@ -77,7 +77,7 @@ public class ServerHttpSecurityTests { public void basic() { given(this.authenticationManager.authenticate(any())).willReturn(Mono.just(new TestingAuthenticationToken("rob", "rob", "ROLE_USER", "ROLE_ADMIN"))); - this.http.securityContextRepository(new WebSessionSecurityContextServerRepository()); + this.http.securityContextRepository(new WebSessionServerSecurityContextRepository()); this.http.httpBasic(); this.http.authenticationManager(this.authenticationManager); ServerHttpSecurity.AuthorizeExchangeBuilder authorize = this.http.authorizeExchange(); diff --git a/webflux/src/main/java/org/springframework/security/web/server/authentication/AuthenticationWebFilter.java b/webflux/src/main/java/org/springframework/security/web/server/authentication/AuthenticationWebFilter.java index f5fa337a9b..370f1d94b6 100644 --- a/webflux/src/main/java/org/springframework/security/web/server/authentication/AuthenticationWebFilter.java +++ b/webflux/src/main/java/org/springframework/security/web/server/authentication/AuthenticationWebFilter.java @@ -26,9 +26,9 @@ import org.springframework.security.core.context.SecurityContextImpl; import org.springframework.security.web.server.ServerHttpBasicAuthenticationConverter; import org.springframework.security.web.server.WebFilterExchange; import org.springframework.security.web.server.authentication.www.HttpBasicServerAuthenticationEntryPoint; -import org.springframework.security.web.server.context.SecurityContextServerRepository; +import org.springframework.security.web.server.context.ServerSecurityContextRepository; import org.springframework.security.web.server.context.SecurityContextRepositoryServerWebExchange; -import org.springframework.security.web.server.context.ServerWebExchangeAttributeSecurityContextServerRepository; +import org.springframework.security.web.server.context.ServerWebExchangeAttributeServerSecurityContextRepository; import org.springframework.security.web.server.util.matcher.ServerWebExchangeMatcher; import org.springframework.security.web.server.util.matcher.ServerWebExchangeMatchers; import org.springframework.util.Assert; @@ -51,7 +51,7 @@ public class AuthenticationWebFilter implements WebFilter { private ServerAuthenticationFailureHandler serverAuthenticationFailureHandler = new ServerAuthenticationEntryPointFailureHandler(new HttpBasicServerAuthenticationEntryPoint()); - private SecurityContextServerRepository securityContextServerRepository = new ServerWebExchangeAttributeSecurityContextServerRepository(); + private ServerSecurityContextRepository serverSecurityContextRepository = new ServerWebExchangeAttributeServerSecurityContextRepository(); private ServerWebExchangeMatcher requiresAuthenticationMatcher = ServerWebExchangeMatchers.anyExchange(); @@ -62,7 +62,7 @@ public class AuthenticationWebFilter implements WebFilter { @Override public Mono filter(ServerWebExchange exchange, WebFilterChain chain) { - ServerWebExchange wrappedExchange = new SecurityContextRepositoryServerWebExchange(exchange, this.securityContextServerRepository); + ServerWebExchange wrappedExchange = new SecurityContextRepositoryServerWebExchange(exchange, this.serverSecurityContextRepository); return filterInternal(wrappedExchange, chain); } @@ -87,15 +87,15 @@ public class AuthenticationWebFilter implements WebFilter { ServerWebExchange exchange = webFilterExchange.getExchange(); SecurityContextImpl securityContext = new SecurityContextImpl(); securityContext.setAuthentication(authentication); - return this.securityContextServerRepository.save(exchange, securityContext) + return this.serverSecurityContextRepository.save(exchange, securityContext) .then(this.serverAuthenticationSuccessHandler .success(authentication, webFilterExchange)); } - public void setSecurityContextServerRepository( - SecurityContextServerRepository securityContextServerRepository) { - Assert.notNull(securityContextServerRepository, "securityContextRepository cannot be null"); - this.securityContextServerRepository = securityContextServerRepository; + public void setServerSecurityContextRepository( + ServerSecurityContextRepository serverSecurityContextRepository) { + Assert.notNull(serverSecurityContextRepository, "securityContextRepository cannot be null"); + this.serverSecurityContextRepository = serverSecurityContextRepository; } public void setServerAuthenticationSuccessHandler(ServerAuthenticationSuccessHandler serverAuthenticationSuccessHandler) { diff --git a/webflux/src/main/java/org/springframework/security/web/server/authentication/logout/SecurityContextServerLogoutHandler.java b/webflux/src/main/java/org/springframework/security/web/server/authentication/logout/SecurityContextServerLogoutHandler.java index 8009e40a4f..85bbb28661 100644 --- a/webflux/src/main/java/org/springframework/security/web/server/authentication/logout/SecurityContextServerLogoutHandler.java +++ b/webflux/src/main/java/org/springframework/security/web/server/authentication/logout/SecurityContextServerLogoutHandler.java @@ -19,9 +19,9 @@ package org.springframework.security.web.server.authentication.logout; import org.springframework.security.core.Authentication; import org.springframework.security.web.server.DefaultServerRedirectStrategy; import org.springframework.security.web.server.ServerRedirectStrategy; -import org.springframework.security.web.server.context.SecurityContextServerRepository; +import org.springframework.security.web.server.context.ServerSecurityContextRepository; import org.springframework.security.web.server.WebFilterExchange; -import org.springframework.security.web.server.context.WebSessionSecurityContextServerRepository; +import org.springframework.security.web.server.context.WebSessionServerSecurityContextRepository; import reactor.core.publisher.Mono; import java.net.URI; @@ -31,7 +31,7 @@ import java.net.URI; * @since 5.0 */ public class SecurityContextServerLogoutHandler implements ServerLogoutHandler { - private SecurityContextServerRepository repository = new WebSessionSecurityContextServerRepository(); + private ServerSecurityContextRepository repository = new WebSessionServerSecurityContextRepository(); private URI logoutSuccessUrl = URI.create("/login?logout"); diff --git a/webflux/src/main/java/org/springframework/security/web/server/context/SecurityContextRepositoryServerWebExchange.java b/webflux/src/main/java/org/springframework/security/web/server/context/SecurityContextRepositoryServerWebExchange.java index 6c4ba5c7e6..21e67975b4 100644 --- a/webflux/src/main/java/org/springframework/security/web/server/context/SecurityContextRepositoryServerWebExchange.java +++ b/webflux/src/main/java/org/springframework/security/web/server/context/SecurityContextRepositoryServerWebExchange.java @@ -27,9 +27,9 @@ import reactor.core.publisher.Mono; * @since 5.0 */ public class SecurityContextRepositoryServerWebExchange extends ServerWebExchangeDecorator { - private final SecurityContextServerRepository repository; + private final ServerSecurityContextRepository repository; - public SecurityContextRepositoryServerWebExchange(ServerWebExchange delegate, SecurityContextServerRepository repository) { + public SecurityContextRepositoryServerWebExchange(ServerWebExchange delegate, ServerSecurityContextRepository repository) { super(delegate); this.repository = repository; } diff --git a/webflux/src/main/java/org/springframework/security/web/server/context/SecurityContextRepositoryWebFilter.java b/webflux/src/main/java/org/springframework/security/web/server/context/SecurityContextRepositoryWebFilter.java index 0300d6b731..934395b876 100644 --- a/webflux/src/main/java/org/springframework/security/web/server/context/SecurityContextRepositoryWebFilter.java +++ b/webflux/src/main/java/org/springframework/security/web/server/context/SecurityContextRepositoryWebFilter.java @@ -26,9 +26,9 @@ import reactor.core.publisher.Mono; * @since 5.0 */ public class SecurityContextRepositoryWebFilter implements WebFilter { - private final SecurityContextServerRepository repository; + private final ServerSecurityContextRepository repository; - public SecurityContextRepositoryWebFilter(SecurityContextServerRepository repository) { + public SecurityContextRepositoryWebFilter(ServerSecurityContextRepository repository) { Assert.notNull(repository, "repository cannot be null"); this.repository = repository; } diff --git a/webflux/src/main/java/org/springframework/security/web/server/context/SecurityContextServerRepository.java b/webflux/src/main/java/org/springframework/security/web/server/context/ServerSecurityContextRepository.java similarity index 95% rename from webflux/src/main/java/org/springframework/security/web/server/context/SecurityContextServerRepository.java rename to webflux/src/main/java/org/springframework/security/web/server/context/ServerSecurityContextRepository.java index 1a0d4c11a6..cc6c9fdcc9 100644 --- a/webflux/src/main/java/org/springframework/security/web/server/context/SecurityContextServerRepository.java +++ b/webflux/src/main/java/org/springframework/security/web/server/context/ServerSecurityContextRepository.java @@ -20,7 +20,7 @@ import org.springframework.web.server.ServerWebExchange; import reactor.core.publisher.Mono; -public interface SecurityContextServerRepository { +public interface ServerSecurityContextRepository { Mono save(ServerWebExchange exchange, SecurityContext context); diff --git a/webflux/src/main/java/org/springframework/security/web/server/context/ServerWebExchangeAttributeSecurityContextServerRepository.java b/webflux/src/main/java/org/springframework/security/web/server/context/ServerWebExchangeAttributeServerSecurityContextRepository.java similarity index 91% rename from webflux/src/main/java/org/springframework/security/web/server/context/ServerWebExchangeAttributeSecurityContextServerRepository.java rename to webflux/src/main/java/org/springframework/security/web/server/context/ServerWebExchangeAttributeServerSecurityContextRepository.java index ef1efa75ea..ac7f10e942 100644 --- a/webflux/src/main/java/org/springframework/security/web/server/context/ServerWebExchangeAttributeSecurityContextServerRepository.java +++ b/webflux/src/main/java/org/springframework/security/web/server/context/ServerWebExchangeAttributeServerSecurityContextRepository.java @@ -25,8 +25,8 @@ import reactor.core.publisher.Mono; * @author Rob Winch * @since 5.0 */ -public class ServerWebExchangeAttributeSecurityContextServerRepository - implements SecurityContextServerRepository { +public class ServerWebExchangeAttributeServerSecurityContextRepository + implements ServerSecurityContextRepository { final String ATTR = "USER"; public Mono save(ServerWebExchange exchange, SecurityContext context) { diff --git a/webflux/src/main/java/org/springframework/security/web/server/context/WebSessionSecurityContextServerRepository.java b/webflux/src/main/java/org/springframework/security/web/server/context/WebSessionServerSecurityContextRepository.java similarity index 93% rename from webflux/src/main/java/org/springframework/security/web/server/context/WebSessionSecurityContextServerRepository.java rename to webflux/src/main/java/org/springframework/security/web/server/context/WebSessionServerSecurityContextRepository.java index 3642e3355c..9104b2c0d3 100644 --- a/webflux/src/main/java/org/springframework/security/web/server/context/WebSessionSecurityContextServerRepository.java +++ b/webflux/src/main/java/org/springframework/security/web/server/context/WebSessionServerSecurityContextRepository.java @@ -25,8 +25,8 @@ import reactor.core.publisher.Mono; * @author Rob Winch * @since 5.0 */ -public class WebSessionSecurityContextServerRepository - implements SecurityContextServerRepository { +public class WebSessionServerSecurityContextRepository + implements ServerSecurityContextRepository { final String SESSION_ATTR = "USER"; public Mono save(ServerWebExchange exchange, SecurityContext context) { diff --git a/webflux/src/test/java/org/springframework/security/web/server/authentication/AuthenticationWebFilterTests.java b/webflux/src/test/java/org/springframework/security/web/server/authentication/AuthenticationWebFilterTests.java index 50017993fc..66bf9311e5 100644 --- a/webflux/src/test/java/org/springframework/security/web/server/authentication/AuthenticationWebFilterTests.java +++ b/webflux/src/test/java/org/springframework/security/web/server/authentication/AuthenticationWebFilterTests.java @@ -30,7 +30,7 @@ import org.springframework.security.authentication.ReactiveAuthenticationManager import org.springframework.security.authentication.TestingAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.test.web.reactive.server.WebTestClientBuilder; -import org.springframework.security.web.server.context.SecurityContextServerRepository; +import org.springframework.security.web.server.context.ServerSecurityContextRepository; import org.springframework.security.web.server.util.matcher.ServerWebExchangeMatcher; import org.springframework.test.web.reactive.server.EntityExchangeResult; import org.springframework.test.web.reactive.server.WebTestClient; @@ -62,7 +62,7 @@ public class AuthenticationWebFilterTests { @Mock private ServerAuthenticationFailureHandler failureHandler; @Mock - private SecurityContextServerRepository securityContextServerRepository; + private ServerSecurityContextRepository serverSecurityContextRepository; private AuthenticationWebFilter filter; @@ -71,7 +71,7 @@ public class AuthenticationWebFilterTests { this.filter = new AuthenticationWebFilter(this.authenticationManager); this.filter.setServerAuthenticationSuccessHandler(this.successHandler); this.filter.setAuthenticationConverter(this.authenticationConverter); - this.filter.setSecurityContextServerRepository(this.securityContextServerRepository); + this.filter.setServerSecurityContextRepository(this.serverSecurityContextRepository); this.filter.setServerAuthenticationFailureHandler(this.failureHandler); } @@ -154,7 +154,7 @@ public class AuthenticationWebFilterTests { .expectBody(String.class).consumeWith(b -> assertThat(b.getResponseBody()).isEqualTo("ok")) .returnResult(); - verify(this.securityContextServerRepository, never()).save(any(), any()); + verify(this.serverSecurityContextRepository, never()).save(any(), any()); verifyZeroInteractions(this.authenticationManager, this.successHandler, this.failureHandler); } @@ -174,7 +174,7 @@ public class AuthenticationWebFilterTests { .expectStatus().is5xxServerError() .expectBody().isEmpty(); - verify(this.securityContextServerRepository, never()).save(any(), any()); + verify(this.serverSecurityContextRepository, never()).save(any(), any()); verifyZeroInteractions(this.authenticationManager, this.successHandler, this.failureHandler); } @@ -185,7 +185,7 @@ public class AuthenticationWebFilterTests { when(this.authenticationConverter.apply(any())).thenReturn(authentication); when(this.authenticationManager.authenticate(any())).thenReturn(authentication); when(this.successHandler.success(any(),any())).thenReturn(Mono.empty()); - when(this.securityContextServerRepository.save(any(),any())).thenAnswer( a -> Mono.just(a.getArguments()[0])); + when(this.serverSecurityContextRepository.save(any(),any())).thenAnswer( a -> Mono.just(a.getArguments()[0])); WebTestClient client = WebTestClientBuilder .bindToWebFilters(this.filter) @@ -199,7 +199,7 @@ public class AuthenticationWebFilterTests { .expectBody().isEmpty(); verify(this.successHandler).success(eq(authentication.block()), any()); - verify(this.securityContextServerRepository).save(any(), any()); + verify(this.serverSecurityContextRepository).save(any(), any()); verifyZeroInteractions(this.failureHandler); } @@ -244,7 +244,7 @@ public class AuthenticationWebFilterTests { .expectBody().isEmpty(); verify(this.failureHandler).onAuthenticationFailure(any(),any()); - verify(this.securityContextServerRepository, never()).save(any(), any()); + verify(this.serverSecurityContextRepository, never()).save(any(), any()); verifyZeroInteractions(this.successHandler); } @@ -265,7 +265,7 @@ public class AuthenticationWebFilterTests { .expectStatus().is5xxServerError() .expectBody().isEmpty(); - verify(this.securityContextServerRepository, never()).save(any(), any()); + verify(this.serverSecurityContextRepository, never()).save(any(), any()); verifyZeroInteractions(this.successHandler, this.failureHandler); } diff --git a/webflux/src/test/java/org/springframework/security/web/server/context/SecurityContextServerRepositoryWebFilterTests.java b/webflux/src/test/java/org/springframework/security/web/server/context/ServerSecurityContextRepositoryWebFilterTests.java similarity index 95% rename from webflux/src/test/java/org/springframework/security/web/server/context/SecurityContextServerRepositoryWebFilterTests.java rename to webflux/src/test/java/org/springframework/security/web/server/context/ServerSecurityContextRepositoryWebFilterTests.java index 64cc7983a3..0548a592a0 100644 --- a/webflux/src/test/java/org/springframework/security/web/server/context/SecurityContextServerRepositoryWebFilterTests.java +++ b/webflux/src/test/java/org/springframework/security/web/server/context/ServerSecurityContextRepositoryWebFilterTests.java @@ -40,11 +40,11 @@ import static org.mockito.Mockito.*; * @since 5.0 */ @RunWith(MockitoJUnitRunner.class) -public class SecurityContextServerRepositoryWebFilterTests { +public class ServerSecurityContextRepositoryWebFilterTests { @Mock Authentication principal; - @Mock SecurityContextServerRepository repository; + @Mock ServerSecurityContextRepository repository; MockServerHttpRequest.BaseBuilder exchange = MockServerHttpRequest.get("/"); @@ -61,7 +61,7 @@ public class SecurityContextServerRepositoryWebFilterTests { @Test(expected = IllegalArgumentException.class) public void constructorNullSecurityContextRepository() { - SecurityContextServerRepository repository = null; + ServerSecurityContextRepository repository = null; new SecurityContextRepositoryWebFilter(repository); } diff --git a/webflux/src/test/java/org/springframework/security/web/server/context/ServerWebExchangeAttributeSecurityContextServerRepositoryTests.java b/webflux/src/test/java/org/springframework/security/web/server/context/ServerWebExchangeAttributeServerSecurityContextRepositoryTests.java similarity index 88% rename from webflux/src/test/java/org/springframework/security/web/server/context/ServerWebExchangeAttributeSecurityContextServerRepositoryTests.java rename to webflux/src/test/java/org/springframework/security/web/server/context/ServerWebExchangeAttributeServerSecurityContextRepositoryTests.java index bc82eadc56..5bbed6740e 100644 --- a/webflux/src/test/java/org/springframework/security/web/server/context/ServerWebExchangeAttributeSecurityContextServerRepositoryTests.java +++ b/webflux/src/test/java/org/springframework/security/web/server/context/ServerWebExchangeAttributeServerSecurityContextRepositoryTests.java @@ -29,8 +29,8 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Rob Winch * @since 5.0 */ -public class ServerWebExchangeAttributeSecurityContextServerRepositoryTests { - ServerWebExchangeAttributeSecurityContextServerRepository repository = new ServerWebExchangeAttributeSecurityContextServerRepository(); +public class ServerWebExchangeAttributeServerSecurityContextRepositoryTests { + ServerWebExchangeAttributeServerSecurityContextRepository repository = new ServerWebExchangeAttributeServerSecurityContextRepository(); ServerWebExchange exchange = MockServerHttpRequest.get("/").toExchange(); @Test