From e9ad7acd3c1fa659a82a33ab36b545ba977dc654 Mon Sep 17 00:00:00 2001 From: Jens Schulze Date: Mon, 24 Feb 2025 09:53:03 +0100 Subject: [PATCH] cleanups --- .../springmvc/config/CtpSecurityConfig.java | 7 +-- .../springmvc/config/CtpSecurityConfig.java | 7 +-- .../springmvc/SpringmvcApplication.java | 1 - .../springmvc/config/CtpSecurityConfig.java | 3 +- .../springmvc/config/CtpSecurityConfig.java | 7 +-- .../sdk/examples/spring/Application.java | 1 - .../spring/config/CtpSecurityConfig.java | 54 ++++++++----------- 7 files changed, 26 insertions(+), 54 deletions(-) diff --git a/examples/spring-datadog-statsd/src/main/java/com/commercetools/sdk/examples/springmvc/config/CtpSecurityConfig.java b/examples/spring-datadog-statsd/src/main/java/com/commercetools/sdk/examples/springmvc/config/CtpSecurityConfig.java index b6387d7a8e7..dd692c4986f 100644 --- a/examples/spring-datadog-statsd/src/main/java/com/commercetools/sdk/examples/springmvc/config/CtpSecurityConfig.java +++ b/examples/spring-datadog-statsd/src/main/java/com/commercetools/sdk/examples/springmvc/config/CtpSecurityConfig.java @@ -6,11 +6,7 @@ import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.web.server.ServerHttpSecurity; import org.springframework.security.web.SecurityFilterChain; -import org.springframework.security.web.server.SecurityWebFilterChain; -import org.springframework.security.web.server.context.ServerSecurityContextRepository; -import org.springframework.security.web.server.context.WebSessionServerSecurityContextRepository; @Configuration @EnableWebSecurity @@ -19,8 +15,7 @@ public class CtpSecurityConfig { @Bean public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { http - .anonymous() - .and() + .anonymous(anonymous -> anonymous.authorities("ROLE_ANON")) .authorizeHttpRequests((requests) -> requests .requestMatchers("**").permitAll() .requestMatchers("/resources/**").permitAll() diff --git a/examples/spring-dynatrace-oneagent/src/main/java/com/commercetools/sdk/examples/springmvc/config/CtpSecurityConfig.java b/examples/spring-dynatrace-oneagent/src/main/java/com/commercetools/sdk/examples/springmvc/config/CtpSecurityConfig.java index b6387d7a8e7..dd692c4986f 100644 --- a/examples/spring-dynatrace-oneagent/src/main/java/com/commercetools/sdk/examples/springmvc/config/CtpSecurityConfig.java +++ b/examples/spring-dynatrace-oneagent/src/main/java/com/commercetools/sdk/examples/springmvc/config/CtpSecurityConfig.java @@ -6,11 +6,7 @@ import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.web.server.ServerHttpSecurity; import org.springframework.security.web.SecurityFilterChain; -import org.springframework.security.web.server.SecurityWebFilterChain; -import org.springframework.security.web.server.context.ServerSecurityContextRepository; -import org.springframework.security.web.server.context.WebSessionServerSecurityContextRepository; @Configuration @EnableWebSecurity @@ -19,8 +15,7 @@ public class CtpSecurityConfig { @Bean public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { http - .anonymous() - .and() + .anonymous(anonymous -> anonymous.authorities("ROLE_ANON")) .authorizeHttpRequests((requests) -> requests .requestMatchers("**").permitAll() .requestMatchers("/resources/**").permitAll() diff --git a/examples/spring-newrelic/src/main/java/com/commercetools/sdk/examples/springmvc/SpringmvcApplication.java b/examples/spring-newrelic/src/main/java/com/commercetools/sdk/examples/springmvc/SpringmvcApplication.java index d97672bc246..b0f38647c7f 100644 --- a/examples/spring-newrelic/src/main/java/com/commercetools/sdk/examples/springmvc/SpringmvcApplication.java +++ b/examples/spring-newrelic/src/main/java/com/commercetools/sdk/examples/springmvc/SpringmvcApplication.java @@ -5,7 +5,6 @@ import org.springframework.context.annotation.ComponentScan; @SpringBootApplication -@ComponentScan public class SpringmvcApplication { public static void main(String[] args) { diff --git a/examples/spring-newrelic/src/main/java/com/commercetools/sdk/examples/springmvc/config/CtpSecurityConfig.java b/examples/spring-newrelic/src/main/java/com/commercetools/sdk/examples/springmvc/config/CtpSecurityConfig.java index b6387d7a8e7..a5a8ed4a527 100644 --- a/examples/spring-newrelic/src/main/java/com/commercetools/sdk/examples/springmvc/config/CtpSecurityConfig.java +++ b/examples/spring-newrelic/src/main/java/com/commercetools/sdk/examples/springmvc/config/CtpSecurityConfig.java @@ -19,8 +19,7 @@ public class CtpSecurityConfig { @Bean public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { http - .anonymous() - .and() + .anonymous(anonymous -> anonymous.authorities("ROLE_ANON")) .authorizeHttpRequests((requests) -> requests .requestMatchers("**").permitAll() .requestMatchers("/resources/**").permitAll() diff --git a/examples/spring-otel/src/main/java/com/commercetools/sdk/examples/springmvc/config/CtpSecurityConfig.java b/examples/spring-otel/src/main/java/com/commercetools/sdk/examples/springmvc/config/CtpSecurityConfig.java index b6387d7a8e7..dd692c4986f 100644 --- a/examples/spring-otel/src/main/java/com/commercetools/sdk/examples/springmvc/config/CtpSecurityConfig.java +++ b/examples/spring-otel/src/main/java/com/commercetools/sdk/examples/springmvc/config/CtpSecurityConfig.java @@ -6,11 +6,7 @@ import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.web.server.ServerHttpSecurity; import org.springframework.security.web.SecurityFilterChain; -import org.springframework.security.web.server.SecurityWebFilterChain; -import org.springframework.security.web.server.context.ServerSecurityContextRepository; -import org.springframework.security.web.server.context.WebSessionServerSecurityContextRepository; @Configuration @EnableWebSecurity @@ -19,8 +15,7 @@ public class CtpSecurityConfig { @Bean public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { http - .anonymous() - .and() + .anonymous(anonymous -> anonymous.authorities("ROLE_ANON")) .authorizeHttpRequests((requests) -> requests .requestMatchers("**").permitAll() .requestMatchers("/resources/**").permitAll() diff --git a/examples/spring/src/main/java/com/commercetools/sdk/examples/spring/Application.java b/examples/spring/src/main/java/com/commercetools/sdk/examples/spring/Application.java index d8dea81cca7..de1b1cb5c6d 100644 --- a/examples/spring/src/main/java/com/commercetools/sdk/examples/spring/Application.java +++ b/examples/spring/src/main/java/com/commercetools/sdk/examples/spring/Application.java @@ -16,7 +16,6 @@ import reactor.netty.http.server.HttpServer; @SpringBootApplication -@ComponentScan @PropertySource(value = "classpath:application.properties", ignoreResourceNotFound = true) public class Application { @Value("${server.port:8080}") diff --git a/examples/spring/src/main/java/com/commercetools/sdk/examples/spring/config/CtpSecurityConfig.java b/examples/spring/src/main/java/com/commercetools/sdk/examples/spring/config/CtpSecurityConfig.java index d08eb33e5d6..245f20f3583 100644 --- a/examples/spring/src/main/java/com/commercetools/sdk/examples/spring/config/CtpSecurityConfig.java +++ b/examples/spring/src/main/java/com/commercetools/sdk/examples/spring/config/CtpSecurityConfig.java @@ -53,40 +53,30 @@ public CtpSecurityConfig( SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) throws Exception { ServerSecurityContextRepository securityContextRepository = new WebSessionServerSecurityContextRepository(); return http.securityContextRepository(securityContextRepository) - .anonymous() - .and() + .anonymous(anonymous -> anonymous.authorities("ROLE_ANON")) .addFilterBefore(new LoginWebFilter(authenticationManagerResolver, securityContextRepository), SecurityWebFiltersOrder.FORM_LOGIN) - .logout() - .logoutUrl("/logout") - .requiresLogout(ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, "/logout")) - .logoutHandler(new DelegatingServerLogoutHandler(new WebSessionServerLogoutHandler(), - new SecurityContextServerLogoutHandler())) - .logoutSuccessHandler(new RedirectServerLogoutSuccessHandler()) - .and() - .formLogin() - .loginPage("/login") - .requiresAuthenticationMatcher(ServerWebExchangeMatchers.pathMatchers("none")) - .authenticationManager(Mono::just) - .and() - .authorizeExchange() - .pathMatchers("/login") - .permitAll() - .pathMatchers("/") - .permitAll() - .pathMatchers("/resources/**") - .permitAll() - .pathMatchers("/home") - .permitAll() - .pathMatchers("/p/**") - .permitAll() - .pathMatchers("/cart/**") - .permitAll() - .pathMatchers("/me/**") - .authenticated() - .anyExchange() - .authenticated() - .and() + .logout(logoutSpec -> logoutSpec + .logoutUrl("/logout") + .requiresLogout(ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, "/logout")) + .logoutSuccessHandler(new RedirectServerLogoutSuccessHandler()) + .logoutHandler(new DelegatingServerLogoutHandler(new WebSessionServerLogoutHandler(), new SecurityContextServerLogoutHandler())) + ) + .formLogin(formLoginSpec -> formLoginSpec + .loginPage("/login") + .requiresAuthenticationMatcher(ServerWebExchangeMatchers.pathMatchers("none")) + .authenticationManager(Mono::just) + ) + .authorizeExchange(authorizeExchangeSpec -> authorizeExchangeSpec + .pathMatchers("/login").permitAll() + .pathMatchers("/").permitAll() + .pathMatchers("/resources/**").permitAll() + .pathMatchers("/home").permitAll() + .pathMatchers("/p/**").permitAll() + .pathMatchers("/cart/**").permitAll() + .pathMatchers("/me/**").authenticated() + .anyExchange().authenticated() + ) .build(); }