Cwikius-Spring/spring-security
1
0
Fork 0
mirror of synced 2026-08-06 10:18:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

SecurityContextRepository->SecurityContextServerRepository

Browse Source 
Issue gh-4615
This commit is contained in:
Rob Winch
2017-10-10 14:31:50 -05:00
parent 57d26ffa10
commit bfcc2a602d
12 changed files with 60 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/src/main/java/org/springframework/security/config/web/server/HttpSecurity.java
+21 -21
View File
@@ -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.AuthenticationReactorContextFilter;
import org.springframework.security.web.server.context.SecurityContextRepository;
import org.springframework.security.web.server.context.SecurityContextServerRepository;
import org.springframework.security.web.server.context.SecurityContextRepositoryWebFilter;
import org.springframework.security.web.server.context.ServerWebExchangeAttributeSecurityContextRepository;
import org.springframework.security.web.server.context.WebSessionSecurityContextRepository;
import org.springframework.security.web.server.context.ServerWebExchangeAttributeSecurityContextServerRepository;
import org.springframework.security.web.server.context.WebSessionSecurityContextServerRepository;
import org.springframework.security.web.server.header.CacheControlHttpHeadersWriter;
import org.springframework.security.web.server.header.CompositeHttpHeadersWriter;
import org.springframework.security.web.server.header.ContentTypeOptionsHttpHeadersWriter;
@@ -94,7 +94,7 @@ public class HttpSecurity {
private ReactiveAuthenticationManager authenticationManager;
private SecurityContextRepository securityContextRepository;
private SecurityContextServerRepository securityContextServerRepository;
private ServerAuthenticationEntryPoint serverAuthenticationEntryPoint;
@@ -127,9 +127,9 @@ public class HttpSecurity {
return this.securityMatcher;
}
public HttpSecurity securityContextRepository(SecurityContextRepository securityContextRepository) {
Assert.notNull(securityContextRepository, "securityContextRepository cannot be null");
this.securityContextRepository = securityContextRepository;
public HttpSecurity securityContextRepository(SecurityContextServerRepository securityContextServerRepository) {
Assert.notNull(securityContextServerRepository, "securityContextRepository cannot be null");
this.securityContextServerRepository = securityContextServerRepository;
return this;
}
@@ -183,15 +183,15 @@ public class HttpSecurity {
}
if(this.httpBasic != null) {
this.httpBasic.authenticationManager(this.authenticationManager);
if(this.securityContextRepository != null) {
this.httpBasic.securityContextRepository(this.securityContextRepository);
if(this.securityContextServerRepository != null) {
this.httpBasic.securityContextRepository(this.securityContextServerRepository);
}
this.httpBasic.configure(this);
}
if(this.formLogin != null) {
this.formLogin.authenticationManager(this.authenticationManager);
if(this.securityContextRepository != null) {
this.formLogin.securityContextRepository(this.securityContextRepository);
if(this.securityContextServerRepository != null) {
this.formLogin.securityContextRepository(this.securityContextServerRepository);
}
if(this.formLogin.serverAuthenticationEntryPoint == null) {
this.webFilters.add(new OrderedWebFilter(new LoginPageGeneratingWebFilter(), SecurityWebFiltersOrder.LOGIN_PAGE_GENERATING.getOrder()));
@@ -233,7 +233,7 @@ public class HttpSecurity {
}
private WebFilter securityContextRepositoryWebFilter() {
SecurityContextRepository repository = this.securityContextRepository;
SecurityContextServerRepository repository = this.securityContextServerRepository;
if(repository == null) {
return null;
}
@@ -322,7 +322,7 @@ public class HttpSecurity {
public class HttpBasicBuilder {
private ReactiveAuthenticationManager authenticationManager;
private SecurityContextRepository securityContextRepository = new ServerWebExchangeAttributeSecurityContextRepository();
private SecurityContextServerRepository securityContextServerRepository = new ServerWebExchangeAttributeSecurityContextServerRepository();
private ServerAuthenticationEntryPoint entryPoint = new HttpBasicServerAuthenticationEntryPoint();
@@ -331,8 +331,8 @@ public class HttpSecurity {
return this;
}
public HttpBasicBuilder securityContextRepository(SecurityContextRepository securityContextRepository) {
this.securityContextRepository = securityContextRepository;
public HttpBasicBuilder securityContextRepository(SecurityContextServerRepository securityContextServerRepository) {
this.securityContextServerRepository = securityContextServerRepository;
return this;
}
@@ -357,8 +357,8 @@ public class HttpSecurity {
this.authenticationManager);
authenticationFilter.setAuthenticationFailureHandler(new AuthenticationEntryPointFailureHandler(this.entryPoint));
authenticationFilter.setAuthenticationConverter(new ServerHttpBasicAuthenticationConverter());
if(this.securityContextRepository != null) {
authenticationFilter.setSecurityContextRepository(this.securityContextRepository);
if(this.securityContextServerRepository != null) {
authenticationFilter.setSecurityContextServerRepository(this.securityContextServerRepository);
}
http.addFilterAt(authenticationFilter, SecurityWebFiltersOrder.HTTP_BASIC);
}
@@ -373,7 +373,7 @@ public class HttpSecurity {
public class FormLoginBuilder {
private ReactiveAuthenticationManager authenticationManager;
private SecurityContextRepository securityContextRepository = new WebSessionSecurityContextRepository();
private SecurityContextServerRepository securityContextServerRepository = new WebSessionSecurityContextServerRepository();
private ServerAuthenticationEntryPoint serverAuthenticationEntryPoint;
@@ -408,8 +408,8 @@ public class HttpSecurity {
return this;
}
public FormLoginBuilder securityContextRepository(SecurityContextRepository securityContextRepository) {
this.securityContextRepository = securityContextRepository;
public FormLoginBuilder securityContextRepository(SecurityContextServerRepository securityContextServerRepository) {
this.securityContextServerRepository = securityContextServerRepository;
return this;
}
@@ -436,7 +436,7 @@ public class HttpSecurity {
authenticationFilter.setAuthenticationFailureHandler(this.authenticationFailureHandler);
authenticationFilter.setAuthenticationConverter(new ServerFormLoginAuthenticationConverter());
authenticationFilter.setAuthenticationSuccessHandler(new RedirectAuthenticationSuccessHandler("/"));
authenticationFilter.setSecurityContextRepository(this.securityContextRepository);
authenticationFilter.setSecurityContextServerRepository(this.securityContextServerRepository);
http.addFilterAt(authenticationFilter, SecurityWebFiltersOrder.FORM_LOGIN);
}
config/src/test/java/org/springframework/security/config/web/server/HttpSecurityTests.java
+4 -5
View File
@@ -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.SecurityContextRepository;
import org.springframework.security.web.server.context.WebSessionSecurityContextRepository;
import org.springframework.security.web.server.context.SecurityContextServerRepository;
import org.springframework.security.web.server.context.WebSessionSecurityContextServerRepository;
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,8 +45,7 @@ import static org.springframework.web.reactive.function.client.ExchangeFilterFun
*/
@RunWith(MockitoJUnitRunner.class)
public class HttpSecurityTests {
@Mock
SecurityContextRepository contextRepository;
@Mock SecurityContextServerRepository contextRepository;
@Mock
ReactiveAuthenticationManager authenticationManager;
@@ -78,7 +77,7 @@ public class HttpSecurityTests {
public void basic() {
given(this.authenticationManager.authenticate(any())).willReturn(Mono.just(new TestingAuthenticationToken("rob", "rob", "ROLE_USER", "ROLE_ADMIN")));
this.http.securityContextRepository(new WebSessionSecurityContextRepository());
this.http.securityContextRepository(new WebSessionSecurityContextServerRepository());
this.http.httpBasic();
this.http.authenticationManager(this.authenticationManager);
HttpSecurity.AuthorizeExchangeBuilder authorize = this.http.authorizeExchange();