Merge pull request #337 from Spring-Framework-Java-Apps/DEV_UPDATE_SPRING

Dev update spring

Author: thomaswoehlke

.idea/compiler.xml

@@ -4,13 +4,13 @@
 
     <groupId>org.woehlke</groupId>
     <artifactId>simpleworklist</artifactId>
-    <version>2.3.37-SNAPSHOT</version>
+    <version>2.3.38-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.4.9</version>
+        <version>2.7.0</version>
     </parent>
 
     <scm>
@@ -75,6 +75,7 @@
         <maven.scm.version>1.13.0</maven.scm.version>
 
         <maven-release-plugin.version>3.0.0-M5</maven-release-plugin.version>
+        <liquibase-maven-plugin.version>4.4.3</liquibase-maven-plugin.version>
 
         <!-- Maven Reports for Site -->
         <maven-site-plugin.version>3.12.0</maven-site-plugin.version>
@@ -106,24 +107,24 @@
 
         <!-- Frontend Server Site: Thymeleaf Templates -->
         <thymeleaf.version>3.0.11.RELEASE</thymeleaf.version>
+        <thymeleaf-spring-data-dialect.version>3.5.0</thymeleaf-spring-data-dialect.version>
+        <thymeleaf-testing.version>3.1.0.M2</thymeleaf-testing.version>
         <!--
          <thymeleaf-extras-data-attribute.version>2.0.1</thymeleaf-extras-data-attribute.version>
          <thymeleaf-extras-java8time.version>3.0.4.RELEASE</thymeleaf-extras-java8time.version>
          <thymeleaf-layout-dialect.version>3.10</thymeleaf-layout-dialect.version>
          -->
-        <thymeleaf-spring-data-dialect.version>3.5.0</thymeleaf-spring-data-dialect.version>
-        <thymeleaf-testing.version>3.1.0.M2</thymeleaf-testing.version>
 
         <!-- Spring Boot and Spring Frameworks -->
         <spring-boot-maven-plugin.version>${project.parent.version}</spring-boot-maven-plugin.version>
 
         <!-- Unit and Integration Testing -->
-        <xmlunit.version>2.9.0</xmlunit.version>
-        <xmlunit2.version>2.9.0</xmlunit2.version>
-        <htmlunit.version>2.62.0</htmlunit.version>
-        <hamcrest.version>2.2</hamcrest.version>
-        <jsoup.version>1.15.1</jsoup.version>
         <skipTests>true</skipTests>
+        <xmlunit2.version>2.6.4</xmlunit2.version>
+        <xmlunit.version>2.6.4</xmlunit.version>
+        <htmlunit.version>2.43.0</htmlunit.version>
+        <hamcrest.version>2.2</hamcrest.version>
+        <jsoup.version>1.14.2</jsoup.version>
     </properties>
 
     <repositories>

pom.xml

@@ -4,17 +4,17 @@
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.woehlke.simpleworklist.application.ApplicationProperties;
-import org.woehlke.simpleworklist.application.config.WebMvcConfig;
-import org.woehlke.simpleworklist.application.config.WebSecurityConfig;
+import org.woehlke.simpleworklist.application.SimpleworklistProperties;
+import org.woehlke.simpleworklist.config.WebMvcConfig;
+import org.woehlke.simpleworklist.config.WebSecurityConfig;
 
 
 @ImportAutoConfiguration({
     WebMvcConfig.class,
     WebSecurityConfig.class
 })
 @EnableConfigurationProperties({
-    ApplicationProperties.class
+    SimpleworklistProperties.class
 })
 @SpringBootApplication
 public class SimpleworklistApplication {

src/main/java/org/woehlke/simpleworklist/SimpleworklistApplication.java

@@ -7,14 +7,15 @@
 import org.springframework.validation.annotation.Validated;
 
 import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 @Component
 @Getter
 @Setter
 @ConfigurationProperties(prefix="org.woehlke.simpleworklist")
 @Validated
-public class ApplicationProperties {
+public class SimpleworklistProperties {
 
     @Valid
     private Mail mail = new Mail();
@@ -86,7 +87,7 @@ public static class WebMvc {
 
         private String[] staticResourceHandler;
 
-        private String[] dynaicResourceHandler;
+        private String[] dynamicResourceHandler;
     }
 
     @Getter
@@ -106,10 +107,10 @@ public static class WebSecurity {
         private Boolean invalidateHttpSession;
 
         @NotNull
-        private String defaultSuccessUrl;
+        private String failureForwardUrl;
 
         @NotNull
-        private String failureForwardUrl;
+        private String defaultSuccessUrl;
 
         @NotNull
         private String usernameParameter;
@@ -124,6 +125,15 @@ public static class WebSecurity {
 
         @NotNull
         private Integer strengthBCryptPasswordEncoder;
+
+        /*
+        @NotNull
+        private Integer hashWidth;
+
+        @NotBlank
+        private String secret;
+        */
+
     }
 
 }

src/main/java/org/woehlke/simpleworklist/application/ApplicationProperties.java renamed to src/main/java/org/woehlke/simpleworklist/application/SimpleworklistProperties.java

@@ -5,7 +5,7 @@
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.SessionAttributes;
 import org.woehlke.simpleworklist.domain.breadcrumb.BreadcrumbService;
-import org.woehlke.simpleworklist.application.ApplicationProperties;
+import org.woehlke.simpleworklist.application.SimpleworklistProperties;
 import org.woehlke.simpleworklist.domain.context.Context;
 import org.woehlke.simpleworklist.domain.project.Project;
 import org.woehlke.simpleworklist.domain.task.TaskService;
@@ -37,7 +37,7 @@
 public abstract class AbstractController {
 
     @Autowired
-    protected ApplicationProperties applicationProperties;
+    protected SimpleworklistProperties simpleworklistProperties;
 
     @Autowired
     protected ProjectService projectService;

src/main/java/org/woehlke/simpleworklist/common/domain/AbstractController.java

@@ -98,7 +98,6 @@ public String handleError(
         return "error/error";
     }
 
-    @Override
     public String getErrorPath() {
         return "/fehler";
     }

src/main/java/org/woehlke/simpleworklist/common/error/ApplicationErrorController.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.config;
+package org.woehlke.simpleworklist.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -18,7 +18,7 @@
 import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
 import org.springframework.web.servlet.i18n.SessionLocaleResolver;
 import org.thymeleaf.dialect.springdata.SpringDataDialect;
-import org.woehlke.simpleworklist.application.ApplicationProperties;
+import org.woehlke.simpleworklist.application.SimpleworklistProperties;
 
 import java.util.Locale;
 import java.util.Properties;
@@ -33,42 +33,42 @@
     "org.woehlke.simpleworklist"
 })
 @EnableConfigurationProperties({
-    ApplicationProperties.class
+    SimpleworklistProperties.class
 })
 public class WebMvcConfig extends WebMvcConfigurerAdapter implements WebMvcConfigurer {
 
-    private final ApplicationProperties applicationProperties;
+    private final SimpleworklistProperties simpleworklistProperties;
 
     @Autowired
-    public WebMvcConfig(ApplicationProperties applicationProperties) {
-        this.applicationProperties = applicationProperties;
+    public WebMvcConfig(SimpleworklistProperties simpleworklistProperties) {
+        this.simpleworklistProperties = simpleworklistProperties;
     }
 
     @Bean
     public JavaMailSender mailSender(){
         Properties javaMailProperties = new Properties();
         javaMailProperties.setProperty(
             "mail.smtp.auth",
-            applicationProperties.getMail().getAuth().toString()
+            simpleworklistProperties.getMail().getAuth().toString()
         );
         javaMailProperties.setProperty(
             "mail.smtp.ssl.enable",
-            applicationProperties.getMail().getSslEnable().toString()
+            simpleworklistProperties.getMail().getSslEnable().toString()
         );
         javaMailProperties.setProperty(
             "mail.smtp.socketFactory.port",
-            applicationProperties.getMail().getSocketFactoryPort()
+            simpleworklistProperties.getMail().getSocketFactoryPort()
         );
         javaMailProperties.setProperty(
             "mail.smtp.socketFactory.class",
-            applicationProperties.getMail().getSocketFactoryClass()
+            simpleworklistProperties.getMail().getSocketFactoryClass()
         );
         JavaMailSenderImpl mailSender = new JavaMailSenderImpl();
         mailSender.setJavaMailProperties(javaMailProperties);
-        mailSender.setHost(applicationProperties.getMail().getHost());
-        mailSender.setPort(applicationProperties.getMail().getPort());
-        mailSender.setUsername(applicationProperties.getMail().getUsername());
-        mailSender.setPassword(applicationProperties.getMail().getPassword());
+        mailSender.setHost(simpleworklistProperties.getMail().getHost());
+        mailSender.setPort(simpleworklistProperties.getMail().getPort());
+        mailSender.setUsername(simpleworklistProperties.getMail().getUsername());
+        mailSender.setPassword(simpleworklistProperties.getMail().getPassword());
         return mailSender;
     }
 
@@ -113,12 +113,12 @@ public void addViewControllers(ViewControllerRegistry registry) {
     }
 
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
-        for(String h :applicationProperties.getWebMvc().getStaticResourceHandler()){
+        for(String h : simpleworklistProperties.getWebMvc().getStaticResourceHandler()){
             String location = "classpath:/static"+h+"/";
             registry.addResourceHandler(h+"/*").addResourceLocations(location);
             registry.addResourceHandler(h+"/**").addResourceLocations(location);
         }
-        for(String h :applicationProperties.getWebMvc().getDynaicResourceHandler()){
+        for(String h : simpleworklistProperties.getWebMvc().getDynamicResourceHandler()){
             String location = h+"/";
             registry.addResourceHandler(h+"/*").addResourceLocations(location);
             registry.addResourceHandler(h+"/**").addResourceLocations(location);

src/main/java/org/woehlke/simpleworklist/application/config/WebMvcConfig.java renamed to src/main/java/org/woehlke/simpleworklist/config/WebMvcConfig.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.config;
+package org.woehlke.simpleworklist.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
@@ -16,12 +16,11 @@
 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.authentication.AuthenticationSuccessHandler;
+import org.springframework.security.crypto.password.Pbkdf2PasswordEncoder;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.woehlke.simpleworklist.application.ApplicationProperties;
-import org.woehlke.simpleworklist.user.login.LoginSuccessHandler;
-import org.woehlke.simpleworklist.user.services.UserAccountSecurityService;
+import org.woehlke.simpleworklist.application.SimpleworklistProperties;
+import org.woehlke.simpleworklist.user.services.SimpleworklistUserAccountSecurityService;
 
 
 @Configuration
@@ -34,25 +33,25 @@
     WebMvcConfig.class
 })
 @EnableConfigurationProperties({
-    ApplicationProperties.class
+    SimpleworklistProperties.class
 })
 public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 
     private final AuthenticationManagerBuilder authenticationManagerBuilder;
-    private final AuthenticationSuccessHandler loginSuccessHandler;
-    private final UserAccountSecurityService userAccountSecurityService;
-    private final ApplicationProperties applicationProperties;
+    //private final AuthenticationSuccessHandler loginSuccessHandler;
+    private final SimpleworklistUserAccountSecurityService simpleworklistUserAccountSecurityService;
+    private final SimpleworklistProperties simpleworklistProperties;
 
     @Autowired
     public WebSecurityConfig(
-        AuthenticationManagerBuilder authenticationManagerBuilder,
-        LoginSuccessHandler loginSuccessHandler,
-        UserAccountSecurityService userAccountSecurityService,
-        ApplicationProperties applicationProperties) {
-        this.authenticationManagerBuilder = authenticationManagerBuilder;
-        this.loginSuccessHandler = loginSuccessHandler;
-        this.userAccountSecurityService = userAccountSecurityService;
-        this.applicationProperties = applicationProperties;
+        AuthenticationManagerBuilder auth,
+        //LoginSuccessHandler loginSuccessHandler,
+        SimpleworklistUserAccountSecurityService simpleworklistUserAccountSecurityService,
+        SimpleworklistProperties simpleworklistProperties) {
+        this.authenticationManagerBuilder = auth;
+        //this.loginSuccessHandler = loginSuccessHandler;
+        this.simpleworklistUserAccountSecurityService = simpleworklistUserAccountSecurityService;
+        this.simpleworklistProperties = simpleworklistProperties;
     }
 
     @Override
@@ -61,35 +60,35 @@ protected void configure(HttpSecurity http) throws Exception {
             .headers()
             .disable()
             .authorizeRequests()
-            .antMatchers(applicationProperties.getWebSecurity().getAntPatternsPublic())
+            .antMatchers(simpleworklistProperties.getWebSecurity().getAntPatternsPublic())
             .permitAll()
             .anyRequest()
             .fullyAuthenticated()
             .and()
             .csrf()
             .and()
             .formLogin()
-            .loginPage(applicationProperties.getWebSecurity().getLoginPage())
-            .usernameParameter(applicationProperties.getWebSecurity().getUsernameParameter())
-            .passwordParameter(applicationProperties.getWebSecurity().getPasswordParameter())
-            .loginProcessingUrl(applicationProperties.getWebSecurity().getLoginProcessingUrl())
-            .failureForwardUrl(applicationProperties.getWebSecurity().getFailureForwardUrl())
-            .defaultSuccessUrl(applicationProperties.getWebSecurity().getDefaultSuccessUrl())
-            .successHandler(loginSuccessHandler)
+            .loginPage(simpleworklistProperties.getWebSecurity().getLoginPage())
+            .usernameParameter(simpleworklistProperties.getWebSecurity().getUsernameParameter())
+            .passwordParameter(simpleworklistProperties.getWebSecurity().getPasswordParameter())
+            .loginProcessingUrl(simpleworklistProperties.getWebSecurity().getLoginProcessingUrl())
+            .failureForwardUrl(simpleworklistProperties.getWebSecurity().getFailureForwardUrl())
+            .defaultSuccessUrl(simpleworklistProperties.getWebSecurity().getDefaultSuccessUrl())
+            //.successHandler(loginSuccessHandler)
             .permitAll()
             .and()
             .csrf()
             .and()
             .logout()
-            .logoutUrl(applicationProperties.getWebSecurity().getLogoutUrl())
-            .deleteCookies(applicationProperties.getWebSecurity().getCookieNamesToClear())
-            .invalidateHttpSession(applicationProperties.getWebSecurity().getInvalidateHttpSession())
+            .logoutUrl(simpleworklistProperties.getWebSecurity().getLogoutUrl())
+            .deleteCookies(simpleworklistProperties.getWebSecurity().getCookieNamesToClear())
+            .invalidateHttpSession(simpleworklistProperties.getWebSecurity().getInvalidateHttpSession())
             .permitAll();
     }
 
     @Bean
     public UserDetailsService userDetailsService(){
-        return this.userAccountSecurityService;
+        return this.simpleworklistUserAccountSecurityService;
     }
 
     /**
@@ -98,8 +97,16 @@ public UserDetailsService userDetailsService(){
      */
     @Bean
     public PasswordEncoder encoder(){
-        int strength = applicationProperties.getWebSecurity().getStrengthBCryptPasswordEncoder();
+        int strength = simpleworklistProperties.getWebSecurity().getStrengthBCryptPasswordEncoder();
         return new BCryptPasswordEncoder(strength);
+        /*Ü
+        CharSequence secret=this.simpleworklistProperties.getWebSecurity().getSecret();
+        int iterations=this.simpleworklistProperties.getWebSecurity().getIterations();
+        int hashWidth=this.simpleworklistProperties.getWebSecurity().getHashWidth();
+        Pbkdf2PasswordEncoder encoder = (new Pbkdf2PasswordEncoder(secret,iterations,hashWidth));
+        encoder.setEncodeHashAsBase64(true);
+        return encoder;
+        */
     }
 
     @Bean
@@ -113,7 +120,7 @@ public AuthenticationManager authenticationManager() throws Exception {
     public UsernamePasswordAuthenticationFilter authenticationFilter() throws Exception {
         UsernamePasswordAuthenticationFilter filter = new UsernamePasswordAuthenticationFilter();
         filter.setAuthenticationManager(authenticationManager());
-        filter.setFilterProcessesUrl(applicationProperties.getWebSecurity().getLoginProcessingUrl());
+        filter.setFilterProcessesUrl(simpleworklistProperties.getWebSecurity().getLoginProcessingUrl());
         return filter;
     }
 }

src/main/java/org/woehlke/simpleworklist/application/config/WebSecurityConfig.java renamed to src/main/java/org/woehlke/simpleworklist/config/WebSecurityConfig.java

@@ -2,5 +2,5 @@
 
 import org.springframework.security.core.userdetails.UserDetailsService;
 
-public interface UserAccountSecurityService extends UserDetailsService {
+public interface SimpleworklistUserAccountSecurityService extends UserDetailsService {
 }