work

Author: thomaswoehlke

pom.xml

@@ -1530,6 +1530,9 @@
 
         <profile>
             <id>jar</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
             <properties>
                 <skip.unit.tests>true</skip.unit.tests>
                 <skip.integration.tests>true</skip.integration.tests>
@@ -1542,6 +1545,9 @@
 
         <profile>
             <id>docker</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
             <properties>
                 <skipTests>false</skipTests>
                 <skip.unit.tests>false</skip.unit.tests>
@@ -1561,6 +1567,9 @@
 
         <profile>
             <id>cloud</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
             <properties>
                 <skip.unit.tests>true</skip.unit.tests>
                 <skip.integration.tests>true</skip.integration.tests>
@@ -1573,6 +1582,9 @@
 
         <profile>
             <id>test</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
             <properties>
                 <skipTests>false</skipTests>
                 <skip.unit.tests>false</skip.unit.tests>
@@ -1587,6 +1599,9 @@
 
         <profile>
             <id>uml</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
             <properties>
                 <skip.unit.tests>true</skip.unit.tests>
                 <skip.integration.tests>true</skip.integration.tests>

src/main/java/org/woehlke/java/simpleworklist/config/WebSecurityConfig.java

@@ -7,18 +7,17 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.data.web.config.EnableSpringDataWebSupport;
-import org.springframework.http.HttpMethod;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.web.WebSecurityConfigurer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.builders.WebSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
@@ -37,7 +36,7 @@
 @EnableConfigurationProperties({
     SimpleworklistProperties.class
 })
-public class WebSecurityConfig extends WebSecurityConfigurerAdapter implements WebSecurityConfigurer<WebSecurity> {
+public class WebSecurityConfig implements WebSecurityConfigurer<WebSecurity> {
 
     private final AuthenticationManagerBuilder authenticationManagerBuilder;
     private final AuthenticationSuccessHandler authenticationSuccessHandler;
@@ -56,8 +55,48 @@ public WebSecurityConfig(
         this.simpleworklistProperties = simpleworklistProperties;
     }
 
+    @Bean
+    public UserDetailsService userDetailsService(){
+        return this.applicationUserDetailsService;
+    }
+
+    /**
+     * @see <a href="https://bcrypt-generator.com/">bcrypt-generator.com</a>
+     * @return PasswordEncoder encoder
+     */
+    @Bean
+    public PasswordEncoder encoder(){
+        int strength = simpleworklistProperties.getWebSecurity().getStrengthBCryptPasswordEncoder();
+        return new BCryptPasswordEncoder(strength);
+    }
+
+    @Bean
+    public AuthenticationManager authenticationManager() throws Exception {
+        return authenticationManagerBuilder
+            .userDetailsService(userDetailsService())
+            .passwordEncoder(encoder()).and().build();
+    }
+
+    @Bean
+    public UsernamePasswordAuthenticationFilter authenticationFilter() throws Exception {
+        UsernamePasswordAuthenticationFilter filter = new UsernamePasswordAuthenticationFilter();
+        filter.setAuthenticationManager(authenticationManager());
+        filter.setFilterProcessesUrl(simpleworklistProperties.getWebSecurity().getLoginProcessingUrl());
+        return filter;
+    }
+
+    @Override
+    public void init(WebSecurity builder) throws Exception {
+
+    }
+
     @Override
-    protected void configure(HttpSecurity http) throws Exception {
+    public void configure(WebSecurity builder) throws Exception {
+
+    }
+
+    @Bean
+    public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
         http
             .headers()
             .disable()
@@ -88,35 +127,7 @@ protected void configure(HttpSecurity http) throws Exception {
             .deleteCookies(simpleworklistProperties.getWebSecurity().getCookieNamesToClear())
             .invalidateHttpSession(simpleworklistProperties.getWebSecurity().getInvalidateHttpSession())
             .permitAll();
+        return http.build();
     }
 
-    @Bean
-    public UserDetailsService userDetailsService(){
-        return this.applicationUserDetailsService;
-    }
-
-    /**
-     * @see <a href="https://bcrypt-generator.com/">bcrypt-generator.com</a>
-     * @return PasswordEncoder encoder
-     */
-    @Bean
-    public PasswordEncoder encoder(){
-        int strength = simpleworklistProperties.getWebSecurity().getStrengthBCryptPasswordEncoder();
-        return new BCryptPasswordEncoder(strength);
-    }
-
-    @Bean
-    public AuthenticationManager authenticationManager() throws Exception {
-        return authenticationManagerBuilder
-            .userDetailsService(userDetailsService())
-            .passwordEncoder(encoder()).and().build();
-    }
-
-    @Bean
-    public UsernamePasswordAuthenticationFilter authenticationFilter() throws Exception {
-        UsernamePasswordAuthenticationFilter filter = new UsernamePasswordAuthenticationFilter();
-        filter.setAuthenticationManager(authenticationManager());
-        filter.setFilterProcessesUrl(simpleworklistProperties.getWebSecurity().getLoginProcessingUrl());
-        return filter;
-    }
 }