feat: upgrade to spring boot 3 and spring shell 3 (#278)

Author: fonimus

.github/workflows/release.yml

@@ -29,10 +29,10 @@ jobs:
         uses: actions/checkout@v3
         with:
           persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal token
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3.10.0
         with:
-          java-version: 11
+          java-version: 17
           distribution: temurin
           cache: maven
       - name: Import GPG key

.github/workflows/reusable-build.yml

@@ -27,10 +27,10 @@ jobs:
       - uses: actions/checkout@v3
         with:
           ref: ${{ inputs.ref }}
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3.10.0
         with:
-          java-version: 11
+          java-version: 17
           distribution: temurin
           cache: maven
 

README.md

@@ -797,6 +797,12 @@ public class ApplicationTest {
 
 ## Release notes
 
+### 3.0.0
+
+* Bump spring-boot.version 2.7.5 to 3.0.2
+* Bump spring-shell-starter 2.1.5 to 3.0.0
+* Java 17 minimum is required
+
 ### 2.0.3
 
 * Bump spring-boot.version from 2.7.3 to 2.7.5

pom.xml

@@ -20,7 +20,7 @@
 
     <groupId>com.github.fonimus</groupId>
     <artifactId>ssh-shell-spring-boot-parent</artifactId>
-    <version>2.0.4-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
 
     <packaging>pom</packaging>
 
@@ -51,12 +51,12 @@
     </licenses>
 
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!--dependencies-->
-        <spring-boot.version>2.7.5</spring-boot.version>
-        <spring-shell.version>2.1.5</spring-shell.version>
+        <spring-boot.version>3.0.2</spring-boot.version>
+        <spring-shell.version>3.0.0</spring-shell.version>
         <sshd.version>2.9.2</sshd.version>
         <junit-jupiter.version>5.9.2</junit-jupiter.version>
         <!--sonar-->
@@ -202,6 +202,9 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.10.1</version>
                 <configuration>
+                    <compilerArgs>
+                        <arg>-parameters</arg>
+                    </compilerArgs>
                     <forceJavacCompilerUse>true</forceJavacCompilerUse>
                 </configuration>
             </plugin>

samples/basic/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <artifactId>ssh-shell-spring-boot-parent</artifactId>
         <groupId>com.github.fonimus</groupId>
-        <version>2.0.4-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

samples/complete/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <artifactId>ssh-shell-spring-boot-parent</artifactId>
         <groupId>com.github.fonimus</groupId>
-        <version>2.0.4-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

…sh/shell/complete/DemoConfiguration.java …hell/complete/CompleteConfiguration.javasamples/complete/src/main/java/com/github/fonimus/ssh/shell/complete/DemoConfiguration.java renamed to samples/complete/src/main/java/com/github/fonimus/ssh/shell/complete/CompleteConfiguration.java samples/complete/src/main/java/com/github/fonimus/ssh/shell/complete/DemoConfiguration.java renamed to samples/complete/src/main/java/com/github/fonimus/ssh/shell/complete/CompleteConfiguration.java

@@ -20,6 +20,8 @@
 import com.github.fonimus.ssh.shell.listeners.SshShellListener;
 import com.github.fonimus.ssh.shell.postprocess.PostProcessor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.actuate.web.exchanges.HttpExchangeRepository;
+import org.springframework.boot.actuate.web.exchanges.InMemoryHttpExchangeRepository;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -41,17 +43,17 @@
  */
 @Slf4j
 @Configuration
-public class DemoConfiguration implements SchedulingConfigurer {
+public class CompleteConfiguration implements SchedulingConfigurer {
 
     private final TasksCommand tasksCommand;
 
-    public DemoConfiguration(TasksCommand tasksCommand) {
+    public CompleteConfiguration(TasksCommand tasksCommand) {
         this.tasksCommand = tasksCommand;
     }
 
     @Bean
     public PostProcessor<String, String> quotePostProcessor() {
-        return new PostProcessor<String, String>() {
+        return new PostProcessor<>() {
 
             @Override
             public String getName() {
@@ -72,7 +74,7 @@ public String process(String input, List<String> parameters) {
 
     @Bean
     public PostProcessor<String, ZonedDateTime> datePostProcessor() {
-        return new PostProcessor<String, ZonedDateTime>() {
+        return new PostProcessor<>() {
 
             @Override
             public String getName() {
@@ -93,7 +95,7 @@ public ZonedDateTime process(String input, List<String> parameters) {
 
     @Bean
     public PostProcessor<ZonedDateTime, ZonedDateTime> uctPostProcessor() {
-        return new PostProcessor<ZonedDateTime, ZonedDateTime>() {
+        return new PostProcessor<>() {
 
             @Override
             public String getName() {
@@ -166,6 +168,11 @@ public TaskScheduler threadPoolTaskExecutor2() {
         return threadPoolTaskScheduler;
     }
 
+    @Bean
+    public HttpExchangeRepository httpTraceRepository() {
+        return new InMemoryHttpExchangeRepository();
+    }
+
     @Override
     public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
         ThreadPoolTaskScheduler scheduler = new ThreadPoolTaskScheduler();

…h/shell/complete/DemoPromptProvider.java …ell/complete/CompletePromptProvider.javasamples/complete/src/main/java/com/github/fonimus/ssh/shell/complete/DemoPromptProvider.java renamed to samples/complete/src/main/java/com/github/fonimus/ssh/shell/complete/CompletePromptProvider.java samples/complete/src/main/java/com/github/fonimus/ssh/shell/complete/DemoPromptProvider.java renamed to samples/complete/src/main/java/com/github/fonimus/ssh/shell/complete/CompletePromptProvider.java

@@ -24,7 +24,7 @@
 import static org.jline.utils.AttributedStyle.DEFAULT;
 
 @Component
-public class DemoPromptProvider implements PromptProvider {
+public class CompletePromptProvider implements PromptProvider {
 
     @Override
     public AttributedString getPrompt() {

…mus/ssh/shell/complete/DemoSecurity.java …ssh/shell/complete/CompleteSecurity.javasamples/complete/src/main/java/com/github/fonimus/ssh/shell/complete/DemoSecurity.java renamed to samples/complete/src/main/java/com/github/fonimus/ssh/shell/complete/CompleteSecurity.java samples/complete/src/main/java/com/github/fonimus/ssh/shell/complete/DemoSecurity.java renamed to samples/complete/src/main/java/com/github/fonimus/ssh/shell/complete/CompleteSecurity.java

@@ -20,37 +20,30 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+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.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.security.core.userdetails.User;
-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.provisioning.InMemoryUserDetailsManager;
+import org.springframework.security.web.SecurityFilterChain;
 
 /**
  * Security configuration
  */
 @Configuration
 @EnableWebSecurity
-@EnableGlobalMethodSecurity(prePostEnabled = true)
-public class DemoSecurity
-        extends WebSecurityConfigurerAdapter {
+@EnableMethodSecurity
+public class CompleteSecurity {
 
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        http
-                .authorizeRequests()
+    @Bean
+    public SecurityFilterChain filterChain(HttpSecurity http, AuthenticationManager authManager) throws Exception {
+        http.authorizeHttpRequests()
+                .requestMatchers("/ping").permitAll()
                 .requestMatchers(EndpointRequest.to("info")).permitAll()
-                .requestMatchers(EndpointRequest.toAnyEndpoint()).hasRole("ACTUATOR");
-    }
-
-    @Bean("customAuthManager")
-    @Override
-    public AuthenticationManager authenticationManager() throws Exception {
-        return super.authenticationManager();
+                .requestMatchers(EndpointRequest.toAnyEndpoint()).hasRole("ACTUATOR")
+                .and().authenticationManager(authManager);
+        return http.build();
     }
 
     @Bean
@@ -59,14 +52,21 @@ public PasswordEncoder passwordEncoder() {
     }
 
     @Bean
-    public UserDetailsService userDetailsService() {
-        InMemoryUserDetailsManager manager = new InMemoryUserDetailsManager();
-        PasswordEncoder encoder = passwordEncoder();
-        manager.createUser(User.withUsername("user").password(encoder.encode("password")).roles("USER").build());
-        manager.createUser(User.withUsername("actuator").password(encoder.encode("password")).roles("ACTUATOR").build
-                ());
-        manager.createUser(User.withUsername("admin").password(encoder.encode("admin")).roles("ADMIN", "ACTUATOR")
-                .build());
-        return manager;
+    public AuthenticationManager authManager(HttpSecurity http) throws Exception {
+        AuthenticationManagerBuilder authenticationManagerBuilder =
+                http.getSharedObject(AuthenticationManagerBuilder.class);
+        authenticationManagerBuilder.inMemoryAuthentication()
+                .withUser("user")
+                .password(passwordEncoder().encode("password"))
+                .roles("USER")
+                .and()
+                .withUser("actuator")
+                .password(passwordEncoder().encode("password"))
+                .roles("ACTUATOR")
+                .and()
+                .withUser("admin")
+                .password(passwordEncoder().encode("admin"))
+                .roles("ADMIN", "ACTUATOR");
+        return authenticationManagerBuilder.build();
     }
 }

samples/complete/src/main/resources/application.yml

@@ -5,13 +5,11 @@ spring:
     url: jdbc:h2:mem:testdb
   second-datasource:
     url: jdbc:h2:mem:testdb2
-  shell.interactive.enabled: true
   main.lazy-initialization: true
 
 ssh:
   shell:
     authentication: security
-    auth-provider-bean-name: customAuthManager
     authorized-public-keys: classpath:.ssh/authorized.keys
     commands:
       actuator:
@@ -37,8 +35,6 @@ management:
   endpoint:
     shutdown:
       enabled: true
-    threaddump:
-      enabled: false
     health:
       group:
         nocommands: